pep8ify
queryset can be a callable, queryset_factory removed