Doing some formatting changes