checkstyle / pmd fixes