updated todo
updated TODO
Updated TODO
Updated keywords to track
Removed old code
Refactored code