Update TODO
code cleaned