Cleanup and fix example