write the todo for refractoring