even more formatting changes