Cosmetic changes, checkstyle and pmd fixes.