Remove extra space
Perform stripping in one place