Clean up post demo, add comments.