Further fixes to formatting.