Rearranging TODO

[skip ci]