Tweaks to Evaluator. Cleaned up some code and comments