Clean more checkstyle/pmd/findbugs errors