Removes a few excess clones I found. Minor formatting change by
utilizing `map_or`

Release Notes:

- N/A