ENYO-2978: code improvement
ENYO-2978: code improvement

enyojs/ares-project,enyojs/ares-project,mcanthony/ares-project,enyojs/ares-project,mcanthony/ares-project,mcanthony/ares-project,enyojs/ares-project,mcanthony/ares-project,enyojs/ares-project,mcanthony/ares-project,mcanthony/ares-project