sonar full code fixing