Code quality fixes
Merge pull request #18 from robcaw/feature/ConfigurableGenerator

Code quality fixes