Moving a couple of strings to constants