Tidy up some stuff