Unified style.
Deleted TODO-tasks.