diff --git a/.github/workflows/run-tests-on-push-to-main.yml b/.github/workflows/run-tests-on-push-to-main.yml
index 129c76cf..485d03b3 100644
--- a/.github/workflows/run-tests-on-push-to-main.yml
+++ b/.github/workflows/run-tests-on-push-to-main.yml
@@ -28,6 +28,7 @@ jobs:
           cargo clippy \
             --package acropolis_common \
             --package acropolis_codec \
+            --package acropolis_module_address_state \
             --package acropolis_module_assets_state \
             --package acropolis_module_block_unpacker \
             --package acropolis_module_chain_store \
diff --git a/modules/address_state/src/address_state.rs b/modules/address_state/src/address_state.rs
index 1215bf87..4a5b5f4f 100644
--- a/modules/address_state/src/address_state.rs
+++ b/modules/address_state/src/address_state.rs
@@ -90,7 +90,7 @@ impl AddressState {
                 if let Message::Cardano((ref block_info, CardanoMessage::ProtocolParams(params))) =
                     message.as_ref()
                 {
-                    Self::check_sync(&current_block, &block_info, "params");
+                    Self::check_sync(&current_block, block_info, "params");
                     let mut state = state_mutex.lock().await;
                     state.volatile.start_new_epoch(block_info.number);
                     if let Some(shelley) = &params.params.shelley {
@@ -209,21 +209,21 @@ impl AddressState {
                 let state = state_mutex.lock().await;
                 let response = match query {
                     AddressStateQuery::GetAddressUTxOs { address } => {
-                        match state.get_address_utxos(&address).await {
+                        match state.get_address_utxos(address).await {
                             Ok(Some(utxos)) => AddressStateQueryResponse::AddressUTxOs(utxos),
                             Ok(None) => AddressStateQueryResponse::NotFound,
                             Err(e) => AddressStateQueryResponse::Error(e.to_string()),
                         }
                     }
                     AddressStateQuery::GetAddressTransactions { address } => {
-                        match state.get_address_transactions(&address).await {
+                        match state.get_address_transactions(address).await {
                             Ok(Some(txs)) => AddressStateQueryResponse::AddressTransactions(txs),
                             Ok(None) => AddressStateQueryResponse::NotFound,
                             Err(e) => AddressStateQueryResponse::Error(e.to_string()),
                         }
                     }
                     AddressStateQuery::GetAddressTotals { address } => {
-                        match state.get_address_totals(&address).await {
+                        match state.get_address_totals(address).await {
                             Ok(totals) => AddressStateQueryResponse::AddressTotals(totals),
                             Err(e) => AddressStateQueryResponse::Error(e.to_string()),
                         }
diff --git a/modules/address_state/src/immutable_address_store.rs b/modules/address_state/src/immutable_address_store.rs
index 391f2716..86135e2e 100644
--- a/modules/address_state/src/immutable_address_store.rs
+++ b/modules/address_state/src/immutable_address_store.rs
@@ -139,17 +139,17 @@ impl ImmutableAddressStore {
             batch.insert(
                 &self.utxos,
                 ADDRESS_UTXOS_EPOCH_COUNTER,
-                &epoch.to_le_bytes(),
+                epoch.to_le_bytes(),
             );
         }
         if persist_txs {
-            batch.insert(&self.txs, ADDRESS_TXS_EPOCH_COUNTER, &epoch.to_le_bytes());
+            batch.insert(&self.txs, ADDRESS_TXS_EPOCH_COUNTER, epoch.to_le_bytes());
         }
         if persist_totals {
             batch.insert(
                 &self.totals,
                 ADDRESS_TOTALS_EPOCH_COUNTER,
-                &epoch.to_le_bytes(),
+                epoch.to_le_bytes(),
             );
         }
 
diff --git a/modules/address_state/src/state.rs b/modules/address_state/src/state.rs
index d54d9265..74ff3a71 100644
--- a/modules/address_state/src/state.rs
+++ b/modules/address_state/src/state.rs
@@ -121,10 +121,7 @@ impl State {
 
         let store = self.immutable.clone();
 
-        let mut combined: Vec<TxIdentifier> = match store.get_txs(address).await? {
-            Some(db) => db,
-            None => Vec::new(),
-        };
+        let mut combined: Vec<TxIdentifier> = store.get_txs(address).await?.unwrap_or_default();
 
         for map in self.volatile.window.iter() {
             if let Some(entry) = map.get(address) {
@@ -148,10 +145,7 @@ impl State {
 
         let store = self.immutable.clone();
 
-        let mut totals = match store.get_totals(address).await? {
-            Some(db) => db,
-            None => AddressTotals::default(),
-        };
+        let mut totals = store.get_totals(address).await?.unwrap_or_default();
 
         for map in self.volatile.window.iter() {
             if let Some(entry) = map.get(address) {