Tidy up formatting a little