Comments and formatting changes.