Various formatting and commenting changes.