CON-2282 Adding descriptive variables instead of magic numbers