Convert hypens to en-dashes and fix formatting