Refactored generator comments