Clean up marked for later references, tweak wording