More improvements to formatting.