Remove some magic strings
Switched to Guava ordering