Clean up how productions are defined
flake8
Merge pull request #65 from alex/cleanup

Clean up how productions are defined