Make more formatting changes