Tidy up, minor refactor, README, update to jdk 1.7