fixed some silly sonar mistakes