Example cleanup, fix for #1