To-do updated.
Some refactoring.
Prepare to typing.