cleaned up evaluation