improve of string escaping