Docstring and comment changes