refactor task list