small changes and cleanups
mavenized it