Cleaning up the pom.xml and a whole bunch of java improvements mainly restricting scope of variables.