converted more strings to constants