refactor code
Apply new task list