Refactor code.
Add TODO list.