diff --git a/TestHosts/TestHosts/SoapServices/PataPawaPostPayService.cs b/TestHosts/TestHosts/SoapServices/PataPawaPostPayService.cs
index 7e089b2..59adf4c 100644
--- a/TestHosts/TestHosts/SoapServices/PataPawaPostPayService.cs
+++ b/TestHosts/TestHosts/SoapServices/PataPawaPostPayService.cs
@@ -68,9 +68,8 @@ public ProcessBillResponse ProcessBill(String username,
                                            String customer_name,
                                            Decimal amount) {
         using ResolvedDbContext<PataPawaContext>? resolvedContext = this.ContextResolver.Resolve(PataPawaReadModelKey);
-        PostPaidAccount account = PataPawaPostPayService.GetAccount(username, api_key, resolvedContext.Context);
+        PostPaidAccount account = GetAccount(username, api_key, resolvedContext.Context);
         if (account == null) {
-            // TODO: this might not be the correct way to respond in this case
             return new ProcessBillResponse {
                                                Status = -1,
                                                Message = "Account not found"
@@ -81,7 +80,6 @@ public ProcessBillResponse ProcessBill(String username,
 
         if (bill == null) {
             // Bill not found
-            // TODO: this might not be the correct way to respond in this case
             return new ProcessBillResponse {
                                                Status = -1,
                                                Message = $"Bill for account no [{account_no}] not found"
@@ -107,7 +105,6 @@ public VerifyResponse VerifyAccount(String username,
         using ResolvedDbContext<PataPawaContext>? resolvedContext = this.ContextResolver.Resolve(PataPawaReadModelKey);
         PostPaidAccount account = PataPawaPostPayService.GetAccount(username, api_key, resolvedContext.Context);
             if (account == null) {
-                // TODO: this might not be the correct way to respond in this case
                 return new VerifyResponse {
                                               AccountNumber = null,
                                               AccountBalance = 0,
@@ -121,7 +118,6 @@ public VerifyResponse VerifyAccount(String username,
 
             if (bill == null) {
                 // Bill not found
-                // TODO: this might not be the correct way to respond in this case
                 return new VerifyResponse {
                                               AccountNumber = null,
                                               AccountBalance = 0,
@@ -142,7 +138,7 @@ public VerifyResponse VerifyAccount(String username,
     private static PostPaidAccount CreatePostPaidAccount(String username,
                                                          String password,
                                                          PataPawaContext context) {
-        PostPaidAccount account = new PostPaidAccount {
+        PostPaidAccount account = new() {
                                                           Password = password,
                                                           UserName = username,
                                                           Balance = 0,