pmd and checkstyle fixes