ENYO-3131: make code prettier