Format tidy-up.