mavenified, first pass at code cleaning