Even more formatting changes