ENYO-3065: improve code readability