remove magic numbers