Refactor pom