Tidy up a few formatting niggles.