PMD - refactor