Removed magic numbers