Refactor. Update string values.