Remove more magic numbers