Minor organizational and formatting changes.