FIX: Checkstyle/PMD fixes