Clean up generator code.
Merge branch 'master' of github.com:kkoser/Sharks