Got rid of magic numbers