tidy-ups for a few examples. More cleanup to come