Update TODO file
Code cleanup