Tidy up some more