Example cleanup

Based on suggestions by @rwaldron