Minor cleanup of examples