Minor adjustment before switching out the jison generated parser
[REFCATOR] Remove jison based parser and switch it out for a custom one. This already gets rid of semicolons and will allow for easier string interpolation and few other things