more pylint fixes
refactor generator methods