ENYO-2577: improve code lisibility
Merge branch 'ENYO-2577' of github.com:enyojs/onyx into ENYO-2577