Improved @spaceless