Bunch of formatting changes