Fix up extra spaces