Update TODO
Minor sanitization and cleanups