refactor for Maven