Cleaning up TODO list
Minor cleanups