Refactor ToDoList