ENYO-3831: improve code readability