various formatting changes