diff --git a/TransactionProcessing.SchedulerService/DataGenerator/Program.cs b/TransactionProcessing.SchedulerService/DataGenerator/Program.cs
index 6465039..a24230d 100644
--- a/TransactionProcessing.SchedulerService/DataGenerator/Program.cs
+++ b/TransactionProcessing.SchedulerService/DataGenerator/Program.cs
@@ -41,7 +41,7 @@ static async Task Main(string[] args){
             baseAddressFunc = (apiName) => {
                                   String ipaddress = "192.168.1.163";
 
-                                  if (apiName == "SecurityService"){
+                                  if (apiName == "SecurityService"){ 
                                       return $"https://{ipaddress}:5001";
                                   }
 
@@ -51,11 +51,11 @@ static async Task Main(string[] args){
                                       //return $"http://127.0.0.1:5002";
                                   }
 
-                                  if (apiName == "FileProcessorApi"){
+                                  if (apiName == "FileProcessorApi"){ 
                                       return $"http://{ipaddress}:5009";
                                   }
 
-                                  if (apiName == "TestHostApi"){
+                                  if (apiName == "TestHostApi"){ 
                                       return $"http://{ipaddress}:9000";
                                   }
 
@@ -89,7 +89,7 @@ static async Task Main(string[] args){
             await Program.GenerateTransactions(g, estateId, cancellationToken);
             //await Program.GenerateStatements(g, estateId, cancellationToken);
 
-            Console.WriteLine($"Process Complete");
+            Console.WriteLine("Process Complete");
         }
 
         private static async Task GenerateStatements(ITransactionDataGeneratorService g, Guid estateId, CancellationToken cancellationToken){
diff --git a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.DataGenerator/TransactionDataGeneratorService.cs b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.DataGenerator/TransactionDataGeneratorService.cs
index e399386..49d719e 100644
--- a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.DataGenerator/TransactionDataGeneratorService.cs
+++ b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.DataGenerator/TransactionDataGeneratorService.cs
@@ -637,7 +637,7 @@ public async Task<Result<MerchantResponse>> GetMerchant(Guid estateId,
             return result;
         }
 
-        this.WriteTrace($"Merchant retrieved successfully");
+        this.WriteTrace("Merchant retrieved successfully");
 
         return result;
     }
@@ -709,15 +709,15 @@ private async Task<Result> SendFloatDepositRequest(Guid estateId,
         Result<String> tokenResult = await this.GetAuthToken(cancellationToken);
         if (tokenResult.IsFailed)
             return ResultHelpers.CreateFailure(tokenResult);
-        this.WriteTrace($"About to Float Credit Request");
+        this.WriteTrace("About to Float Credit Request");
         Result? result = await this.TransactionProcessorClient.RecordFloatCreditPurchase(tokenResult.Data, estateId, request, cancellationToken);
         if (result.IsFailed) {
-            this.WriteError($"Error Float Credit Request");
+            this.WriteError("Error Float Credit Request");
             this.WriteError(result.Message);
             return result;
         }
 
-        this.WriteTrace($"Float Credit Request sent");
+        this.WriteTrace("Float Credit Request sent");
 
         return Result.Success();
     }
@@ -782,10 +782,10 @@ private async Task<Result<SerialisedMessage>> SendSaleTransaction(MerchantRespon
     private readonly String ClientToken;
 
     private async Task<Result<String>> GetAuthToken(CancellationToken cancellationToken) {
-        this.WriteTrace($"About to get auth token");
+        this.WriteTrace("About to get auth token");
 
         if (this.TokenResponse == null) {
-            this.WriteTrace($"TokenResponse was null");
+            this.WriteTrace("TokenResponse was null");
             Result<TokenResponse> tokenResult = await this.SecurityServiceClient.GetToken(this.ClientId, this.ClientSecret, cancellationToken);
 
             if (tokenResult.IsFailed)
@@ -794,14 +794,14 @@ private async Task<Result<String>> GetAuthToken(CancellationToken cancellationTo
         }
 
         if (this.TokenResponse.Expires.UtcDateTime.Subtract(DateTime.UtcNow) < TimeSpan.FromMinutes(2)) {
-            this.WriteTrace($"TokenResponse was expired");
+            this.WriteTrace("TokenResponse was expired");
             Result<TokenResponse> tokenResult = await this.SecurityServiceClient.GetToken(this.ClientId, this.ClientSecret, cancellationToken);
             if (tokenResult.IsFailed)
                 return ResultHelpers.CreateFailure(tokenResult);
             this.TokenResponse = tokenResult.Data;
         }
 
-        this.WriteTrace($"Auth token retrieved");
+        this.WriteTrace("Auth token retrieved");
 
         return Result.Success<String>(this.TokenResponse.AccessToken);
     }
diff --git a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Jobs/Jobs.cs b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Jobs/Jobs.cs
index 5b3bc19..154e254 100644
--- a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Jobs/Jobs.cs
+++ b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/Jobs/Jobs.cs
@@ -95,7 +95,7 @@ public static async Task<Result> GenerateFloatCredits(ITransactionDataGeneratorS
         // Get all the contracts up front
         Result<List<ContractResponse>> contractsResult = await t.GetEstateContracts(config.EstateId, cancellationToken);
         if (contractsResult.IsFailed) {
-            results.Add($"Error getting Contract List");
+            results.Add("Error getting Contract List");
             return Result.Failure($"Error making float credits for [{string.Join(",", results)}]");
         }