Refactoring ParsEval code