Merge pull request #321 from alex/docstring-cleanup

Clean up some docstrings