refactored strings to constants, updated some copy/pasted comments