diff --git a/contracts/external/cw-payroll-factory/src/contract.rs b/contracts/external/cw-payroll-factory/src/contract.rs
index ff033174d..6381aec05 100644
--- a/contracts/external/cw-payroll-factory/src/contract.rs
+++ b/contracts/external/cw-payroll-factory/src/contract.rs
@@ -123,11 +123,7 @@ pub fn instantiate_contract(
 ) -> Result<Response, ContractError> {
     // Check sender is contract owner if set
     let ownership = cw_ownable::get_ownership(deps.storage)?;
-    if ownership
-        .owner
-        .as_ref()
-        .map_or(false, |owner| *owner != sender)
-    {
+    if ownership.owner != Some(sender) {
         return Err(ContractError::Unauthorized {});
     }
 
diff --git a/contracts/voting/dao-voting-onft-staked/src/contract.rs b/contracts/voting/dao-voting-onft-staked/src/contract.rs
index 2ac9b87ba..e6f9e3918 100644
--- a/contracts/voting/dao-voting-onft-staked/src/contract.rs
+++ b/contracts/voting/dao-voting-onft-staked/src/contract.rs
@@ -165,7 +165,8 @@ pub fn execute_confirm_stake(
             // check if sender prepared
             let prepared = PREPARED_ONFTS
                 .may_load(deps.storage, token_id.to_string())?
-                .map_or(false, |preparer| preparer == info.sender);
+                .as_ref()
+                == Some(&info.sender);
 
             // check that NFT was transferred to this contract
             let owner = query_onft_owner(deps.as_ref(), &config.onft_collection_id, token_id)?;
@@ -271,7 +272,7 @@ pub fn execute_cancel_stake(
         }
     } else {
         for (token_id, owner, preparer) in token_ids_with_owners_and_preparers {
-            let is_preparer = preparer.as_ref().map_or(false, |p| *p == info.sender);
+            let is_preparer = preparer.as_ref() == Some(&info.sender);
             // only owner or preparer can cancel stake
             if info.sender != owner && !is_preparer {
                 return Err(ContractError::NotPreparerNorOwner {});