More fixes to format