various formatting changes

Also break lines for easier reading.