adding todo | removing comments