Some stylistic changes to the todo