Get rid of a couple magic numbers