PMD refactor