Tidy up formatting a bit