Cleaned up examples for demo