Get rid of magic numbers