Improve strings
