removed magic numbers/strings