[OE-2716] refactoring