Fixed Sonar Violations