Some more formatting changes.