Cleaned up QueryEvaluator.cpp