Better docstring comments as per PR #964