[OEM-109] code elegance change (doesn't change functionality)