Remove more unneeded formatting changes