Refractoring of new code