Remove extra white-space