Removed some Sonar Violations