Removed some magic strings
Removed some magic strings