Update docstring
Cleanup, comments