[MAINTENANCE] Small refactor (#6422)
[MAINTENANCE] Small refactor (#6422)


great-expectations/great_expectations,great-expectations/great_expectations,great-expectations/great_expectations,great-expectations/great_expectations