Fixed some checkstyle issues