Refactoring (PMD)