Improve docstrings and naming