slight refactoring of pom