Improve strings extraction