eliminated magic numbers