Reduce major Sonar issues
Reduce major Sonar issues