pmd checkstyle improvements