Tidy up. Unfortunately bit-rot has set in here a little.