lots of name changes in evaluator
more thorough clean script
refactoring Evaluator ...