Better strings (IMHO)

Change-Id: I81bfb81e1410ed17e5a955c763ec867205a78ca5