All Checkstyle changes for final project
All have been JUnit approved