Updated TODO and some cleanup