Strings cleanup and reorganize

Change-Id: I06122bc38299ac65ba90eb6e5451080c611c8e02