ENH+FIX: Cleaner, fix example