ENYO-3570: compact code