Additional Checkstyle checks