fixed some sonar code smells