Tidy up to satisfy Bernie Pope's aesthetics! :-)