Tidy up some things