Some changes to formatting.