Added some formatting changes