Add todo refactoring notes