Clean the code and update TODO list