Tidy up some spacing