diff --git a/src/src/lib/cloud/providers/azure/curl/AzureStorage.cc b/src/src/lib/cloud/providers/azure/curl/AzureStorage.cc
index 1b8a004a07f2277f09f24945d897d5c3085aa19e..6a5d7d2bf33cf1362f1832a1fa0b4b795f3b2c19 100644
--- a/src/src/lib/cloud/providers/azure/curl/AzureStorage.cc
+++ b/src/src/lib/cloud/providers/azure/curl/AzureStorage.cc
@@ -130,8 +130,8 @@ namespace seismicdrive
             try
             {
                 auto blobContainerClient = _blob_service_client.GetBlobContainerClient(containerName);
-                auto blockBlobCllient = blobContainerClient.GetBlockBlobClient(blobName);
-                blockBlobCllient.GetProperties();
+                auto blockBlobClient = blobContainerClient.GetBlockBlobClient(blobName);
+                blockBlobClient.GetProperties();
                 return true;
             }
             catch (const Azure::Storage::StorageException &e)
@@ -260,6 +260,12 @@ namespace seismicdrive
             auto result = blobClient.DeleteIfExists();
         }
 
+        template<class T>
+        static auto next_page_token(const T &pageResult)
+        {
+            return pageResult.NextPageToken ? pageResult.NextPageToken.Value() : "";
+        }
+
         void CloudBlobClient::list_blobs_segmented(
             const std::string &containerName,
             const std::string &prefix,
@@ -294,10 +300,7 @@ namespace seismicdrive
                     obi.second = blob.BlobSize;
                     result.emplace_back(obi);
                 }
-                if (pageResult.NextPageToken)
-                {
-                    nextPageToken = pageResult.NextPageToken.Value();
-                }
+                nextPageToken = next_page_token(pageResult);
             }
             else
             {
@@ -309,10 +312,7 @@ namespace seismicdrive
                     obi.second = blob.BlobSize;
                     result.emplace_back(obi);
                 }
-                if (pageResult.NextPageToken)
-                {
-                    nextPageToken = pageResult.NextPageToken.Value();
-                }
+                nextPageToken = next_page_token(pageResult);
             }
         }
 
@@ -351,10 +351,7 @@ namespace seismicdrive
                     obi.size = blob.BlobSize;
                     result.emplace_back(obi);
                 }
-                if (pageResult.NextPageToken)
-                {
-                    nextPageToken = pageResult.NextPageToken.Value();
-                }
+                nextPageToken = next_page_token(pageResult);
             }
             else
             {
@@ -366,10 +363,7 @@ namespace seismicdrive
                     obi.size = blob.BlobSize;
                     result.emplace_back(obi);
                 }
-                if (pageResult.NextPageToken)
-                {
-                    nextPageToken = pageResult.NextPageToken.Value();
-                }
+                nextPageToken = next_page_token(pageResult);
             }
         }