Solved all Sonar violations