Strings cleanup and reorganize

Change-Id: I12c6f3c6e5b1541ea57d796c89f57f5dd9f7f7b7