Remove quotes
Replace hypen