Lots of formatting changes.