evaluation code refactoring;