Reapplied some fo the formatting changes.