began refactoring evaluation classes