Cleanup unwanted spaces