added more formatting changes