Start moving from magic numbers to constants