refectoring close to its end