Resolved some sonar violations