Removed path from query + pep8