And more formatting changes