Organize strings a bit.

I.e. now they are not all over the place.