Fixing and Refactoring Pom