Minor refactoring to the base generator
Merge pull request #213 from GrahamCampbell/generators

Minor refactoring to the base generator