Stylistic changes.
Decisive on todo