Mostly nonfunctional formatting changes