Heavy formatting changes.