CHG: config changes
FIX: PMD violations
FIX: FindBugs violations