Tidy up the formatting a bit.