ENYO-2886: code readability improvement