Minor refactor of string constants