PMD and checkstyle small repairs