Minor automated code cleanup

Please remember to 'mvn clean install' before pushing (or creating pull requests)