More code clean up and updates for talk on July 28th.