Corrected some sonar recommandations