Pass values correctly and add docstrings