Refactored parts of grammar and regenerated Parse Table