pom.xml tidy up and completion