Clean up method calls, docstring