mostly formatting changes