Tidy up some things messed around