davidjpeacock clean up
Latest commit 39868f2 Jun 12, 2018