Sonar Violations Fix.