Some formatting changes