Fixed ToDo.  Without using re or loop

No loop, no re, a bit ugly but still the right one.