Remove extra spaces here as well.