Sonar cleanup

Took care of some more sonar violations