Fix PMD on category refactoring