Whitespace in generator
Use double quotes
Merge branch 'cleanup'