refactoring Generator Mode things

yes