numerous formatting changes