diff --git a/Infrastructure/MassTransit/Activities/Audio/GenerateAudioWorkflowPathsActivity.cs b/Infrastructure/MassTransit/Activities/Audio/GenerateAudioWorkflowPathsActivity.cs
index aecdd9a..fd0b8f8 100644
--- a/Infrastructure/MassTransit/Activities/Audio/GenerateAudioWorkflowPathsActivity.cs
+++ b/Infrastructure/MassTransit/Activities/Audio/GenerateAudioWorkflowPathsActivity.cs
@@ -49,7 +49,7 @@ namespace Musify.Infrastructure.Messaging.Activities
                     [RoutingSlipVariableNames.Audio.WorkingDirectory] = workingDirectory,
                     [RoutingSlipVariableNames.Audio.SourceFilePath] = sourceFilePath,
                     [RoutingSlipVariableNames.Audio.TranscodedDirectory] = workingDirectory
-                });
+                } );
             }
             catch (Exception exception)
             {
diff --git a/Infrastructure/MassTransit/Activities/Audio/TranscodeDashAudioActivity.cs b/Infrastructure/MassTransit/Activities/Audio/TranscodeDashAudioActivity.cs
index 4856b8b..0fc18ad 100644
--- a/Infrastructure/MassTransit/Activities/Audio/TranscodeDashAudioActivity.cs
+++ b/Infrastructure/MassTransit/Activities/Audio/TranscodeDashAudioActivity.cs
@@ -35,9 +35,7 @@ namespace Musify.Infrastructure.Messaging.Activities
             var workingDirectory = executeContext.GetVariable<string>(executeContext.Arguments.WorkingDirectoryVariableName);
 
             if (string.IsNullOrWhiteSpace(sourceFilePath) || string.IsNullOrWhiteSpace(workingDirectory))
-            {
                 throw new InvalidOperationException("Transcode activity requires source file path and working directory variables.");
-            }
 
             try
             {
@@ -72,11 +70,7 @@ namespace Musify.Infrastructure.Messaging.Activities
         {
             try
             {
-                if (Directory.Exists(compensateContext.Log.WorkingDirectory))
-                {
-                    Directory.Delete(compensateContext.Log.WorkingDirectory, true);
-                }
-
+                Directory.Delete(compensateContext.Log.WorkingDirectory, recursive: true);
                 return Task.FromResult(compensateContext.Compensated());
             }
             catch (Exception exception)
diff --git a/Infrastructure/MassTransit/Activities/Files/DownloadFileFromBucketActivity.cs b/Infrastructure/MassTransit/Activities/Files/DownloadFileFromBucketActivity.cs
index d64b602..15ce560 100644
--- a/Infrastructure/MassTransit/Activities/Files/DownloadFileFromBucketActivity.cs
+++ b/Infrastructure/MassTransit/Activities/Files/DownloadFileFromBucketActivity.cs
@@ -57,9 +57,7 @@ namespace Musify.Infrastructure.Messaging.Activities
 
                 var destinationDirectory = Path.GetDirectoryName(destinationPath);
                 if (!string.IsNullOrWhiteSpace(destinationDirectory))
-                {
                     Directory.CreateDirectory(destinationDirectory);
-                }
 
                 using var fileStream = getFile.Value;
                 if (fileStream.CanSeek)
@@ -83,11 +81,7 @@ namespace Musify.Infrastructure.Messaging.Activities
         {
             try
             {
-                if (File.Exists(compensateContext.Log.DestinationFilePath))
-                {
-                    File.Delete(compensateContext.Log.DestinationFilePath);
-                }
-
+                File.Delete(compensateContext.Log.DestinationFilePath);
                 return Task.FromResult(compensateContext.Compensated());
             }
             catch (Exception exception)
diff --git a/Infrastructure/MassTransit/Activities/Files/TransferFilesToBucket.cs b/Infrastructure/MassTransit/Activities/Files/TransferFilesToBucket.cs
index ace2c4e..4fb8380 100644
--- a/Infrastructure/MassTransit/Activities/Files/TransferFilesToBucket.cs
+++ b/Infrastructure/MassTransit/Activities/Files/TransferFilesToBucket.cs
@@ -33,21 +33,15 @@ namespace Musify.Infrastructure.Messaging.Activities
 
             var folderPath = executeContext.GetVariable<string>(executeContext.Arguments.SourceDirectoryVariableName);
             if (string.IsNullOrWhiteSpace(folderPath))
-            {
                 throw new InvalidOperationException(
                     $"Transfer activity requires variable '{executeContext.Arguments.SourceDirectoryVariableName}' with source directory path.");
-            }
 
             var destinationKeyName = executeContext.Arguments.DestinationKeyName;
             if (string.IsNullOrWhiteSpace(destinationKeyName) && !string.IsNullOrWhiteSpace(executeContext.Arguments.DestinationKeyNameVariableName))
-            {
                 destinationKeyName = executeContext.GetVariable<string>(executeContext.Arguments.DestinationKeyNameVariableName);
-            }
 
             if (string.IsNullOrWhiteSpace(destinationKeyName))
-            {
                 throw new InvalidOperationException("Transfer activity requires a destination key name from arguments or variables.");
-            }
 
             try
             {
diff --git a/Infrastructure/MassTransit/Activities/Pictures/ResizePictureActivity.cs b/Infrastructure/MassTransit/Activities/Pictures/ResizePictureActivity.cs
index 975d52b..9438005 100644
--- a/Infrastructure/MassTransit/Activities/Pictures/ResizePictureActivity.cs
+++ b/Infrastructure/MassTransit/Activities/Pictures/ResizePictureActivity.cs
@@ -35,9 +35,7 @@ namespace Musify.Infrastructure.Messaging.Activities
             var destinationFilePath = executeContext.GetVariable<string>(executeContext.Arguments.DestinationFilePathVariableName);
 
             if (string.IsNullOrWhiteSpace(sourceFilePath) || string.IsNullOrWhiteSpace(destinationFilePath))
-            {
                 throw new InvalidOperationException("Resize activity requires source and destination file path variables.");
-            }
 
             try
             {
@@ -96,11 +94,7 @@ namespace Musify.Infrastructure.Messaging.Activities
         {
             try
             {
-                if (File.Exists(compensateContext.Log.DestinationFilePath))
-                {
-                    File.Delete(compensateContext.Log.DestinationFilePath);
-                }
-
+                File.Delete(compensateContext.Log.DestinationFilePath);
                 return Task.FromResult(compensateContext.Compensated());
             }
             catch (Exception exception)
diff --git a/Infrastructure/MassTransit/RoutingSlip/Builders/AudioWorkflowRoutingSlipBuilder.cs b/Infrastructure/MassTransit/RoutingSlip/Builders/AudioWorkflowRoutingSlipBuilder.cs
index 262e2fc..5ca26af 100644
--- a/Infrastructure/MassTransit/RoutingSlip/Builders/AudioWorkflowRoutingSlipBuilder.cs
+++ b/Infrastructure/MassTransit/RoutingSlip/Builders/AudioWorkflowRoutingSlipBuilder.cs
@@ -3,6 +3,7 @@ using Musify.Application.Events;
 using Musify.Infrastructure.Configuration;
 using Musify.Infrastructure.Messaging.Activities;
 using Musify.Infrastructure.Messaging.Activities.Arguments;
+using Musify.Infrastructure.Messaging.Consumers;
 
 namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
 {
@@ -16,14 +17,14 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.GenerateAudioWorkflowPaths,
-                Consumers.MessagingHelper.BuildExecuteActivityUri(GenerateAudioWorkflowPathsActivity.ExecuteEndpointName),
+                MessagingHelper.BuildExecuteActivityUri(GenerateAudioWorkflowPathsActivity.ExecuteEndpointName),
                 new GenerateAudioWorkflowPathsArguments(
                     workerConfiguration.Routes.TemporaryFilesDirectory,
                     message.SourceKeyName));
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.DownloadFile,
-                Consumers.MessagingHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName),
+                MessagingHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName),
                 new DownloadFileFromBucketArguments(
                     message.SourceBucketName,
                     message.SourceKeyName,
@@ -31,14 +32,14 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.TranscodeAudio,
-                Consumers.MessagingHelper.BuildExecuteActivityUri(TranscodeDashAudioActivity.ExecuteEndpointName),
+                MessagingHelper.BuildExecuteActivityUri(TranscodeDashAudioActivity.ExecuteEndpointName),
                 new TranscodeDashAudioArguments(
                     RoutingSlipVariableNames.Audio.SourceFilePath,
                     RoutingSlipVariableNames.Workflow.TempDirectory));
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.UploadFiles,
-                Consumers.MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucket.ExecuteEndpointName),
+                MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucket.ExecuteEndpointName),
                 new TransferFilesToBucketArguments(
                     message.DestinationBucketName,
                     RoutingSlipVariableNames.Audio.TranscodedDirectory,
diff --git a/Infrastructure/MassTransit/RoutingSlip/Builders/PictureWorkflowRoutingSlipBuilder.cs b/Infrastructure/MassTransit/RoutingSlip/Builders/PictureWorkflowRoutingSlipBuilder.cs
index 6abff35..9334473 100644
--- a/Infrastructure/MassTransit/RoutingSlip/Builders/PictureWorkflowRoutingSlipBuilder.cs
+++ b/Infrastructure/MassTransit/RoutingSlip/Builders/PictureWorkflowRoutingSlipBuilder.cs
@@ -3,6 +3,7 @@ using Musify.Application.Events;
 using Musify.Infrastructure.Configuration;
 using Musify.Infrastructure.Messaging.Activities;
 using Musify.Infrastructure.Messaging.Activities.Arguments;
+using Musify.Infrastructure.Messaging.Consumers;
 
 namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
 {
@@ -26,7 +27,7 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.UpdateTrackPicture,
-                Consumers.MessagingHelper.BuildExecuteActivityUri(UpdateTrackPictureActivity.ExecuteEndpointName),
+                MessagingHelper.BuildExecuteActivityUri(UpdateTrackPictureActivity.ExecuteEndpointName),
                 new UpdateTrackPictureArguments(
                     message.TrackId,
                     message.SourceKeyName,
@@ -55,7 +56,7 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.UpdatePlayListPicture,
-                Consumers.MessagingHelper.BuildExecuteActivityUri(UpdatePlayListPictureActivity.ExecuteEndpointName),
+                MessagingHelper.BuildExecuteActivityUri(UpdatePlayListPictureActivity.ExecuteEndpointName),
                 new UpdatePlayListPictureArguments(
                     message.PlayListId,
                     message.SourceKeyName,
@@ -86,7 +87,7 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.GeneratePictureWorkflowPaths,
-                Consumers.MessagingHelper.BuildExecuteActivityUri(GeneratePictureWorkflowPathsActivity.ExecuteEndpointName),
+                MessagingHelper.BuildExecuteActivityUri(GeneratePictureWorkflowPathsActivity.ExecuteEndpointName),
                 new GeneratePictureWorkflowPathsArguments(
                     workerConfiguration.Routes.TemporaryFilesDirectory,
                     sourceKeyName,
@@ -96,7 +97,7 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.DownloadFile,
-                Consumers.MessagingHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName),
+                MessagingHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName),
                 new DownloadFileFromBucketArguments(
                     sourceBucketName,
                     sourceKeyName,
@@ -125,12 +126,12 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.DeleteOriginal,
-                Consumers.MessagingHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
+                MessagingHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
                 new RemoveFileFromBucketArguments(sourceBucketName, sourceKeyName));
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.UploadFiles,
-                Consumers.MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucket.ExecuteEndpointName),
+                MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucket.ExecuteEndpointName),
                 new TransferFilesToBucketArguments(
                     sourceBucketName,
                     RoutingSlipVariableNames.Workflow.TempDirectory,
@@ -148,7 +149,7 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
         {
             routingSlipBuilder.AddActivity(
                 activityName,
-                Consumers.MessagingHelper.BuildExecuteActivityUri(ResizePictureActivity.ExecuteEndpointName),
+                MessagingHelper.BuildExecuteActivityUri(ResizePictureActivity.ExecuteEndpointName),
                 new ResizePictureLocalArguments(
                     RoutingSlipVariableNames.Picture.OriginalFilePath,
                     destinationFilePathVariableName,
diff --git a/Infrastructure/MassTransit/RoutingSlip/Builders/RemoveFileRoutingSlipBuilder.cs b/Infrastructure/MassTransit/RoutingSlip/Builders/RemoveFileRoutingSlipBuilder.cs
index 3728465..b6aa05a 100644
--- a/Infrastructure/MassTransit/RoutingSlip/Builders/RemoveFileRoutingSlipBuilder.cs
+++ b/Infrastructure/MassTransit/RoutingSlip/Builders/RemoveFileRoutingSlipBuilder.cs
@@ -1,6 +1,7 @@
 using MassTransit;
 using Musify.Application.Events;
 using Musify.Infrastructure.Messaging.Activities;
+using Musify.Infrastructure.Messaging.Consumers;
 
 namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
 {
@@ -14,7 +15,7 @@ namespace Musify.Infrastructure.Messaging.RoutingSlip.Builders
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.RemoveFile,
-                Consumers.MessagingHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
+                MessagingHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
                 new Activities.Arguments.RemoveFileFromBucketArguments(
                     message.BucketName,
                     message.KeyName));