Rewrite properties set, to better match project code style