UAR-606

There seems to be a good amount of duplicate magic strings in this class; would it be worth the time to extract them out to class constants?