refact properties