more format clean up