Updated docstrings and addressed review comments in pr 1295