diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeWaiveCannotBeReversedException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeWaiveCannotBeReversedException.java
index 58c5f5bcc..1ed8e194e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeWaiveCannotBeReversedException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeWaiveCannotBeReversedException.java
@@ -28,9 +28,7 @@ public class LoanChargeWaiveCannotBeReversedException extends AbstractPlatformDo
         ALREADY_PAID, ALREADY_WAIVED, LOAN_INACTIVE, WAIVE_NOT_ALLOWED_FOR_CHARGE, NOT_WAIVED, ALREADY_REVERSED;
 
         public String errorMessage() {
-            /**
-             * TODO: Recheck the error messages
-             */
+
             if (name().toString().equalsIgnoreCase("ALREADY_PAID")) {
                 return "This loan charge has been completely paid";
             } else if (name().toString().equalsIgnoreCase("ALREADY_WAIVED")) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResource.java
index 834c371a9..af5e2d3d5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResource.java
@@ -256,21 +256,13 @@ public class LoanTransactionsApiResource {
             @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapperBuilder builder = new CommandWrapperBuilder().withJson(apiRequestBodyAsJson);
-        CommandProcessingResult result = null;
-
         final CommandWrapper commandRequest = builder.adjustTransaction(loanId, transactionId).build();
-        result = this.commandsSourceWritePlatformService.logCommandSource(commandRequest);
+
+        final CommandProcessingResult result = this.commandsSourceWritePlatformService.logCommandSource(commandRequest);
 
         return this.toApiJsonSerializer.serialize(result);
     }
 
-    /**
-     * TODO: Add Swagger annotations.
-     *
-     * @param loanId
-     * @param transactionId
-     * @return
-     */
     @PUT
     @Path("{transactionId}")
     @Consumes({ MediaType.APPLICATION_JSON })