todo example changes per code review