Refactoring leases and embargos