removed some more sonar violations