Replace more magic numbers with constants.