ParsEval refactor