some more formatting changes