Refactor QueryHandler; Refactor Evaluator.java