Get rid of some hardcoded strings