pom's refactoring