Format clean-up.