General format cleanup