formatting changes, mostly