Fixed spacing and removed dashes