Clean up some of the evaluation section