En dash rather than hyphen

Also standardise on double hyphen.