Cleanup example just a little more