more pom refactoring