ParsEval refactor continued