Refactoring

Improved comment number & quality
Cleanup and verbose variable names
Support for multisymbol constituent grammars