Documentation comment changes: further cleanup