Fixed some Checkstyle issues