Improved string escape