Cleanup and docstring update