cleaned up some magic numbers