removed some sonar violations