Clean up autocomplete method signature, docstrings