Refactor: string values