Moving some strings to constants