[OE-3949] refactor