[ENYO-19] beautified files