eliminated some magic numbers