- further cleaned up examples