chore: minor generator refactor