update: move string literals to constants and string variables