Tons of formatting changes