ENYO-2151: apply better code style