remove some magic numbers