Checkstyle amendments