tidy up some stuff