few refactorings in pom