Checkstyle improvements