Fixed a few spacing issues found after running 'mvn checkstyle'