Improve strings and move arrays to correct place.

Change-Id: I502eb88e21fd9c609f828be69d8a747e24c0d56e