sonar violations fixed