finish initial phase of refractoring