Tweak wording, cleanup code examples