Cleanup
Inversed order of eq() structure to match statement