refactor To do