Tidy up the formatting a little