Checkstyle fixes
PMD fixes