Refactoring reflection evaluator.calculators