Updated TODO, small cleanup