ENYO-2500: simplify method