Tidy up some