#89: Replace strings with constants