Sonar code improvements.