Cleaned up code for talk on 10/05/2013.