Mostly formatting changes