removed magic numbers