Address sonar issues in models