Some formatting changes for easier reading