Improve strings.

Change-Id: I8d23479cac769ec5f6b3ae6dde9faa17cb6df025