Update : corrected sonar suggestions

Update : corrected sonar suggestions