All Sonar Issues now fixed