Refactor code
Update to-do list