min refactor, update todo list