Better strings

Change-Id: I8e1c97d9ab8df29947e672a214ca006f1f26ba1e