Refactoring furch PMD