Tidy up some bits