Few formatting changes