some mvn refactoring