Some more checkstyle fixes
Merge pull request #39 from UniversityRadioYork/checkstyle

Some more checkstyle fixes