Cleaning up some more issues identified by SonarQube