minor cleanup / re-arrange pom