Some more formatting changes