Fixed some of the checkstyle issues