cleanup & docstrings
fix docstring
defquery example