checkstyle/pmd/etc. corrections