Fixing more checkstyle and pmd issues