More checkstyle updates