Tidied up the evaluator output