Tweak docstring and comments