diff --git a/MessagingService.BusinessLogic.Tests/Services/MessagingDomainServiceTests.cs b/MessagingService.BusinessLogic.Tests/Services/MessagingDomainServiceTests.cs
index 98405c4..8af24e9 100644
--- a/MessagingService.BusinessLogic.Tests/Services/MessagingDomainServiceTests.cs
+++ b/MessagingService.BusinessLogic.Tests/Services/MessagingDomainServiceTests.cs
@@ -434,9 +434,7 @@ public async Task MessagingDomainService_UpdateSMSMessageStatus_MessageUpdated(B
                 new(emailAggregateRepository.Object, smsAggregateRepository.Object, emailServiceProxy.Object, smsServiceProxy.Object);
 
             SMSCommands.UpdateMessageStatusCommand command = new(TestData.MessageId, status, TestData.ProviderStatusDescription, TestData.BouncedDateTime);
-            Should.NotThrow(async () => {
-                await messagingDomainService.UpdateMessageStatus(command, CancellationToken.None);
-            });
+            Should.NotThrow(async () => await messagingDomainService.UpdateMessageStatus(command, CancellationToken.None));
         }
 
         [Theory]
diff --git a/MessagingService.EmailAggregate.Tests/EmailAggregateTests.cs b/MessagingService.EmailAggregate.Tests/EmailAggregateTests.cs
index f034bb7..c24f21d 100644
--- a/MessagingService.EmailAggregate.Tests/EmailAggregateTests.cs
+++ b/MessagingService.EmailAggregate.Tests/EmailAggregateTests.cs
@@ -120,7 +120,7 @@ public void EmailAggregate_MarkMessageAsDelivered_IncorrectState_ErrorThrown(Mes
 
             }
 
-            Should.Throw<InvalidOperationException>(() => { emailAggregate.MarkMessageAsDelivered(TestData.ProviderStatusDescription, TestData.DeliveredDateTime); });
+            Should.Throw<InvalidOperationException>(() => emailAggregate.MarkMessageAsDelivered(TestData.ProviderStatusDescription, TestData.DeliveredDateTime));
         }
 
         [Fact]
@@ -171,7 +171,7 @@ public void EmailAggregate_MarkMessageAsRejected_IncorrectState_ErrorThrown(Mess
                     break;
             }
 
-            Should.Throw<InvalidOperationException>(() => { emailAggregate.MarkMessageAsRejected(TestData.ProviderStatusDescription, TestData.RejectedDateTime); });
+            Should.Throw<InvalidOperationException>(() => emailAggregate.MarkMessageAsRejected(TestData.ProviderStatusDescription, TestData.RejectedDateTime));
         }
 
         [Fact]
@@ -222,7 +222,7 @@ public void EmailAggregate_MarkMessageAsFailed_IncorrectState_ErrorThrown(Messag
                     break;
             }
 
-            Should.Throw<InvalidOperationException>(() => { emailAggregate.MarkMessageAsFailed(TestData.ProviderStatusDescription, TestData.FailedDateTime); });
+            Should.Throw<InvalidOperationException>(() => emailAggregate.MarkMessageAsFailed(TestData.ProviderStatusDescription, TestData.FailedDateTime));
         }
 
         [Fact]
@@ -273,7 +273,7 @@ public void EmailAggregate_MarkMessageAsBounced_IncorrectState_ErrorThrown(Messa
                     break;
             }
 
-            Should.Throw<InvalidOperationException>(() => { emailAggregate.MarkMessageAsBounced(TestData.ProviderStatusDescription, TestData.BouncedDateTime); });
+            Should.Throw<InvalidOperationException>(() => emailAggregate.MarkMessageAsBounced(TestData.ProviderStatusDescription, TestData.BouncedDateTime));
         }
 
         [Fact]
@@ -324,7 +324,7 @@ public void EmailAggregate_MarkMessageAsSpam_IncorrectState_ErrorThrown(MessageS
                     break;
             }
 
-            Should.Throw<InvalidOperationException>(() => { emailAggregate.MarkMessageAsSpam(TestData.ProviderStatusDescription, TestData.SpamDateTime); });
+            Should.Throw<InvalidOperationException>(() => emailAggregate.MarkMessageAsSpam(TestData.ProviderStatusDescription, TestData.SpamDateTime));
         }
 
 
diff --git a/MessagingService.IntegrationTesting.Helpers/MessagingSteps.cs b/MessagingService.IntegrationTesting.Helpers/MessagingSteps.cs
index 887b772..15e800a 100644
--- a/MessagingService.IntegrationTesting.Helpers/MessagingSteps.cs
+++ b/MessagingService.IntegrationTesting.Helpers/MessagingSteps.cs
@@ -39,13 +39,9 @@ public async Task GivenISendTheFollowingSMSMessages(String accessToken, List<Sen
 
         public async Task WhenIResendTheFollowingMessages(String accessToken, List<ResendEmailRequest> requests){
             foreach (ResendEmailRequest resendEmailRequest in requests){
-                await Retry.For(async () => {
-                                    Should.NotThrow(async () => {
-                                                        await this.MessagingServiceClient.ResendEmail(accessToken,
-                                                                                                      resendEmailRequest,
-                                                                                                      CancellationToken.None);
-                                                    });
-                                });
+                await Retry.For(async () => Should.NotThrow(async () => await this.MessagingServiceClient.ResendEmail(accessToken,
+                                                                                                                      resendEmailRequest,
+                                                                                                                      CancellationToken.None)));
             }
         }
 
diff --git a/MessagingService.SMSAggregate.Tests/SMSAggregateTests.cs b/MessagingService.SMSAggregate.Tests/SMSAggregateTests.cs
index eb12c01..96b1428 100644
--- a/MessagingService.SMSAggregate.Tests/SMSAggregateTests.cs
+++ b/MessagingService.SMSAggregate.Tests/SMSAggregateTests.cs
@@ -95,10 +95,7 @@ public void SMSAggregate_MarkMessageAsDelivered_IncorrectState_ErrorThrown(Messa
                     break;
             }
 
-            Should.Throw<InvalidOperationException>(() =>
-            {
-                smsAggregate.MarkMessageAsDelivered(TestData.ProviderStatusDescription, TestData.DeliveredDateTime);
-            });
+            Should.Throw<InvalidOperationException>(() => smsAggregate.MarkMessageAsDelivered(TestData.ProviderStatusDescription, TestData.DeliveredDateTime));
         }
 
         [Fact]
@@ -150,10 +147,7 @@ public void SMSAggregate_MarkMessageAsExpired_IncorrectState_ErrorThrown(Message
                     break;
             }
 
-            Should.Throw<InvalidOperationException>(() =>
-            {
-                smsAggregate.MarkMessageAsExpired(TestData.ProviderStatusDescription, TestData.DeliveredDateTime);
-            });
+            Should.Throw<InvalidOperationException>(() => smsAggregate.MarkMessageAsExpired(TestData.ProviderStatusDescription, TestData.DeliveredDateTime));
         }
 
         [Fact]
@@ -205,10 +199,7 @@ public void SMSAggregate_MarkMessageAsUndeliverable_IncorrectState_ErrorThrown(M
                     break;
             }
 
-            Should.Throw<InvalidOperationException>(() =>
-            {
-                smsAggregate.MarkMessageAsUndeliverable(TestData.ProviderStatusDescription, TestData.DeliveredDateTime);
-            });
+            Should.Throw<InvalidOperationException>(() => smsAggregate.MarkMessageAsUndeliverable(TestData.ProviderStatusDescription, TestData.DeliveredDateTime));
         }
 
         [Fact]
@@ -260,10 +251,7 @@ public void SMSAggregate_MarkMessageAsRejected_IncorrectState_ErrorThrown(Messag
                     break;
             }
 
-            Should.Throw<InvalidOperationException>(() =>
-            {
-                smsAggregate.MarkMessageAsRejected(TestData.ProviderStatusDescription, TestData.DeliveredDateTime);
-            });
+            Should.Throw<InvalidOperationException>(() => smsAggregate.MarkMessageAsRejected(TestData.ProviderStatusDescription, TestData.DeliveredDateTime));
         }
 
         [Fact]
diff --git a/MessagingService.Tests/ControllerTests.cs b/MessagingService.Tests/ControllerTests.cs
index e09291a..97cd806 100644
--- a/MessagingService.Tests/ControllerTests.cs
+++ b/MessagingService.Tests/ControllerTests.cs
@@ -39,9 +39,7 @@ public async Task DomainEventController_EventIdNotPresentInJson_ErrorThrown() {
                                                };
             String json = "{\r\n  \"messageId\": \"811bb215-0d99-4639-ac3a-195ba4a47449\",\r\n  \"providerRequestReference\": \"d8f669fa-675d-11ec-8b59-f23c92160e3c\"\r\n}\t";
             Object request = JsonConvert.DeserializeObject(json);
-            ArgumentException ex = Should.Throw<ArgumentException>(async () => {
-                                                                       await controller.PostEventAsync(request, CancellationToken.None);
-                                                                   });
+            ArgumentException ex = Should.Throw<ArgumentException>(() => controller.PostEventAsync(request, CancellationToken.None));
             ex.Message.ShouldBe("Domain Event must contain an Event Id");
         }
 
@@ -61,9 +59,7 @@ public async Task DomainEventController_EventIdPresentInJson_NoErrorThrown()
                                                };
             String json = "{\r\n  \"messageId\": \"811bb215-0d99-4639-ac3a-195ba4a47449\",\r\n  \"providerRequestReference\": \"d8f669fa-675d-11ec-8b59-f23c92160e3c\",\r\n  \"eventId\": \"123bb215-0d99-4639-ac3a-195ba4a47449\"\r\n}\t";
             Object request = JsonConvert.DeserializeObject(json);
-            Should.NotThrow(async () => {
-                                                                       await controller.PostEventAsync(request, CancellationToken.None);
-                                                                   });
+            Should.NotThrow(async () => await controller.PostEventAsync(request, CancellationToken.None));
         }
     }
 }
diff --git a/MessagingService/Bootstrapper/MediatorRegistry.cs b/MessagingService/Bootstrapper/MediatorRegistry.cs
index 1335ddd..f6f9467 100644
--- a/MessagingService/Bootstrapper/MediatorRegistry.cs
+++ b/MessagingService/Bootstrapper/MediatorRegistry.cs
@@ -25,9 +25,6 @@ public MediatorRegistry()
         this.AddSingleton<IRequestHandler<SMSCommands.UpdateMessageStatusCommand, Result>, MessagingRequestHandler>();
         this.AddSingleton<IRequestHandler<EmailCommands.UpdateMessageStatusCommand, Result>, MessagingRequestHandler>();
 
-        this.AddSingleton<Func<String, String>>(container => (serviceName) =>
-                                                             {
-                                                                 return ConfigurationReader.GetBaseServerUri(serviceName).OriginalString;
-                                                             });
+        this.AddSingleton<Func<String, String>>(container => (serviceName) => ConfigurationReader.GetBaseServerUri(serviceName).OriginalString);
     }
 }
\ No newline at end of file
diff --git a/MessagingService/Bootstrapper/RepositoryRegistry.cs b/MessagingService/Bootstrapper/RepositoryRegistry.cs
index 618c770..042bc7b 100644
--- a/MessagingService/Bootstrapper/RepositoryRegistry.cs
+++ b/MessagingService/Bootstrapper/RepositoryRegistry.cs
@@ -38,8 +38,6 @@ public RepositoryRegistry()
         this.AddSingleton<IAggregateRepository<EmailAggregate, DomainEvent>, AggregateRepository<EmailAggregate, DomainEvent>>();
         this.AddSingleton<IAggregateRepository<SMSAggregate, DomainEvent>, AggregateRepository<SMSAggregate, DomainEvent>>();
 
-        this.AddSingleton<Func<String, Int32, ISubscriptionRepository>>(cont => (esConnString, cacheDuration) => {
-                                                                                    return SubscriptionRepository.Create(esConnString, cacheDuration);
-                                                                                });
+        this.AddSingleton<Func<String, Int32, ISubscriptionRepository>>(cont => (esConnString, cacheDuration) => SubscriptionRepository.Create(esConnString, cacheDuration));
     }
 }
\ No newline at end of file