Lots of formatting changes