More fixes to formatting