Improve docstrings. Address comments.