Format clean-up