refactor two evaluations services