Rectifying and adding docstrings