Sonar code cleanup.