PMD Refactoring