Tidy up.  Fix stuff I did not like in the 2014 version.