[OE-3949] refactor
[OE-3949] refactor