A few more formatting changes