24557 - refactor