More checkstyle