Fixed a whole load of checkstyle warnings