Simplify self-update code
Tweak wording