Removed all magic numbers/strings