Added more formatting changes