remove some more magic numbers