checkstyle and pmd fixes