huge formatting changes