Tidy-up formatting.