refactor mvn2 some more