more format fix-up