Improve strings.

Change-Id: I852e220586d41f7c1f6b945a1efd2132fc615c5b