Do TODO list. Remove TODO list. Refactoring.