ENYO-2403: Fixed indentation
ENYO-2403: Fixed typos
ENYO-2403: optimise saveProperty creation