Some docstring cleanups as per review comments