[OEM-255] refactored a bit