[embargoes & leases] minor refactoring