checkstyle improvements