diff --git a/base_layer/common_types/src/tari_address/dual_address.rs b/base_layer/common_types/src/tari_address/dual_address.rs
index 57e1ac5fc9..da0dce5156 100644
--- a/base_layer/common_types/src/tari_address/dual_address.rs
+++ b/base_layer/common_types/src/tari_address/dual_address.rs
@@ -162,7 +162,7 @@ impl DualAddress {
         Self::from_bytes(buf.as_slice())
     }
 
-    /// Convert Tari Address to bytes
+    /// Convert Tari Address to hex string
     pub fn to_hex(&self) -> String {
         let buf = self.to_bytes();
         buf.to_hex()
diff --git a/base_layer/common_types/src/tari_address/mod.rs b/base_layer/common_types/src/tari_address/mod.rs
index 32ffedd063..0daa6c831b 100644
--- a/base_layer/common_types/src/tari_address/mod.rs
+++ b/base_layer/common_types/src/tari_address/mod.rs
@@ -136,7 +136,7 @@ impl TariAddress {
         }
     }
 
-    /// Construct an TariAddress from an emoji string with checksum trying to calculate the network
+    /// Construct an TariAddress from an emoji string with checksum
     pub fn from_emoji_string(emoji: &str) -> Result<Self, TariAddressError> {
         let bytes = TariAddress::emoji_to_bytes(emoji)?;
 
diff --git a/base_layer/common_types/src/tari_address/single_address.rs b/base_layer/common_types/src/tari_address/single_address.rs
index a286371235..765958fd43 100644
--- a/base_layer/common_types/src/tari_address/single_address.rs
+++ b/base_layer/common_types/src/tari_address/single_address.rs
@@ -108,7 +108,7 @@ impl SingleAddress {
         &self.public_spend_key
     }
 
-    /// Construct Tari Address from bytes and try to calculate the network
+    /// Construct Tari Address from bytes
     pub fn from_bytes(bytes: &[u8]) -> Result<Self, TariAddressError>
     where Self: Sized {
         if bytes.len() != INTERNAL_SINGLE_SIZE {
diff --git a/base_layer/wallet/src/transaction_service/service.rs b/base_layer/wallet/src/transaction_service/service.rs
index 08dd5d833a..d74b6a3414 100644
--- a/base_layer/wallet/src/transaction_service/service.rs
+++ b/base_layer/wallet/src/transaction_service/service.rs
@@ -2337,7 +2337,7 @@ where
                 .insert(data.tx_id, tx_finalized_sender);
             self.receiver_transaction_cancellation_senders
                 .insert(data.tx_id, cancellation_sender);
-            // We are recieving an interactive transaction from someone on our network, so we assume is features are
+            // We are recieving an interactive transaction from someone on our network, so we assume its features are
             // interactive and its the same network
             let source_address = TariAddress::new_single_address(
                 source_pubkey,
diff --git a/base_layer/wallet/src/utxo_scanner_service/uxto_scanner_service_builder.rs b/base_layer/wallet/src/utxo_scanner_service/uxto_scanner_service_builder.rs
index e30858c562..c6bde867f4 100644
--- a/base_layer/wallet/src/utxo_scanner_service/uxto_scanner_service_builder.rs
+++ b/base_layer/wallet/src/utxo_scanner_service/uxto_scanner_service_builder.rs
@@ -108,7 +108,7 @@ impl UtxoScannerServiceBuilder {
         wallet: &WalletSqlite,
         shutdown_signal: ShutdownSignal,
     ) -> Result<UtxoScannerService<WalletSqliteDatabase, WalletConnectivityHandle>, KeyManagerServiceError> {
-        let view_key = wallet.key_manager_service.get_view_key_id().await?;
+        let view_key_id = wallet.key_manager_service.get_view_key_id().await?;
         let view_key = wallet.key_manager_service.get_public_key_at_key_id(&view_key).await?;
         let tari_address = TariAddress::new_dual_address_with_default_features(
             view_key,
@@ -165,7 +165,7 @@ impl UtxoScannerServiceBuilder {
         one_sided_message_watch: watch::Receiver<String>,
         recovery_message_watch: watch::Receiver<String>,
     ) -> Result<UtxoScannerService<TBackend, TWalletConnectivity>, KeyManagerServiceError> {
-        let view_key = key_manager.get_view_key_id().await?;
+        let view_key_id = key_manager.get_view_key_id().await?;
         let view_key = key_manager.get_public_key_at_key_id(&view_key).await?;
         let tari_address =
             TariAddress::new_dual_address_with_default_features(view_key, node_identity.public_key().clone(), network);
diff --git a/base_layer/wallet/src/wallet.rs b/base_layer/wallet/src/wallet.rs
index 6660f23f69..5364a9f6a0 100644
--- a/base_layer/wallet/src/wallet.rs
+++ b/base_layer/wallet/src/wallet.rs
@@ -488,7 +488,7 @@ where
     }
 
     pub async fn get_wallet_id(&self) -> Result<WalletIdentity, WalletError> {
-        let view_key = self.key_manager_service.get_view_key_id().await?;
+        let view_key_id = self.key_manager_service.get_view_key_id().await?;
         let view_key = self.key_manager_service.get_public_key_at_key_id(&view_key).await?;
         let address = TariAddress::new_dual_address_with_default_features(
             view_key.clone(),