Improve docstring and symbol names