Upgrade examples

Very simple fixes to hide the example code.

A few cleanups.