made the evaluation more modular in preparation for new features