Added new refactoring ToDo.