Format cleanup while re-reading