[OE-3987] refactoring in progress