Some (hopefully final) checkstyle fixes
Unbreak stuff
Merge pull request #40 from UniversityRadioYork/checkstyle

Some (hopefully final) checkstyle fixes