ENYO-1336: Minor code style enhancement