Change order of xkcd enable
Simplify data munging in ValueComparison
graph refactoring