Code cleanup
Minor cleanup
Merge
Merge branch 'master' of github.com:claassen/ParserGenerator