Refactored variables in parser engine