Removed all magic strings in logic