Remove unneeded comparison
Tweak plot spec
New way of processing variables and data