Utilised Java 8 (and 7) features to tidy up code. Formatting and minor tweaks. Contributed by Graham Russell (graham at ham1.co.uk). Part 8/8 of github pr #255. This closes #225.