Cleaning up some of the SonarQube issues.