Clean up and modifications in conjuction with blog post.