Format update and cleaning