Further clean up
update TODO