checkstyle clean-up