Code refractoring in progress 1/2