Remove unwanted spaces