Properties refractoring