Tidy up the formatting