Some checkstyle issues