pom's refactorings