TODO.txt updated. Code cleanup