More format cleanup