Refactor + change in pom