tidy up some things