Cleanup and update TODO