Cleaned up and updated pom.xml