improve refactoring todo