I implemented the sonar fixes