started refractoring