Removed "magic strings" and added comments