Fix bugs with previous commit. Or, Lloyd is bad at reviews
Merge pull request #38 from UniversityRadioYork/checkstyle

Fix bugs with previous commit. Or, Lloyd is bad at reviews