Rename function
Improve docstrings