Cleaned-up examples