Mavenizing
Minor refactorings