pmd/checkstyle violations fixed.