diff --git a/fineract-provider/config/checkstyle/checkstyle.xml b/fineract-provider/config/checkstyle/checkstyle.xml
index f26f63460..847c42a97 100644
--- a/fineract-provider/config/checkstyle/checkstyle.xml
+++ b/fineract-provider/config/checkstyle/checkstyle.xml
@@ -166,6 +166,7 @@
              <message key="ws.notPreceded"
              value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
         </module>
+        <module name="ParenPad" />
 <!-- TODO Enable many more checks (go about this one by one, step by step, raise separate PRs fixing and then enforcing):
 
         <module name="HiddenField">
@@ -196,7 +197,7 @@
             <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, STATIC_INIT, INSTANCE_INIT"/>
         </module>
 
-        <module name="ParenPad" />
+
 
         <module name="MultipleVariableDeclarations"/>
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDropdownReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDropdownReadPlatformServiceImpl.java
index 45353d2dd..ba9413819 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDropdownReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDropdownReadPlatformServiceImpl.java
@@ -61,11 +61,10 @@ public class SmsCampaignDropdownReadPlatformServiceImpl implements SmsCampaignDr
 
     @Override
     public Collection<EnumOptionData> retrieveCampaignTriggerTypes() {
-        final List<EnumOptionData> triggerTypeCodeValues = Arrays.asList( //
-                SmsCampaignEnumerations.smscampaignTriggerType(SmsCampaignTriggerType.DIRECT), //
-                SmsCampaignEnumerations.smscampaignTriggerType(SmsCampaignTriggerType.SCHEDULE), //
-                SmsCampaignEnumerations.smscampaignTriggerType(SmsCampaignTriggerType.TRIGGERED) //
-        );
+        final List<EnumOptionData> triggerTypeCodeValues = Arrays.asList(
+                SmsCampaignEnumerations.smscampaignTriggerType(SmsCampaignTriggerType.DIRECT),
+                SmsCampaignEnumerations.smscampaignTriggerType(SmsCampaignTriggerType.SCHEDULE),
+                SmsCampaignEnumerations.smscampaignTriggerType(SmsCampaignTriggerType.TRIGGERED));
 
         return triggerTypeCodeValues;
     }
@@ -90,9 +89,7 @@ public class SmsCampaignDropdownReadPlatformServiceImpl implements SmsCampaignDr
 
     @Override
     public Collection<EnumOptionData> retrieveCampaignTypes() {
-        final List<EnumOptionData> campaignTypeCodeValues = Arrays.asList( //
-                SmsCampaignEnumerations.smscampaignType(CampaignType.SMS)//
-        );
+        final List<EnumOptionData> campaignTypeCodeValues = Arrays.asList(SmsCampaignEnumerations.smscampaignType(CampaignType.SMS));
         return campaignTypeCodeValues;
     }
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java
index 9a2183f09..283efa1c0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java
@@ -105,8 +105,8 @@ public class TenantDatabaseUpgradeService {
         LOG.info("upgradeTenantDB: FINERACT_DEFAULT_TENANTDB_HOSTNAME = {}, FINERACT_DEFAULT_TENANTDB_PORT = {}", dbHostname, dbPort);
 
         final Flyway flyway = Flyway.configure().dataSource(tenantDataSource).locations("sql/migrations/list_db").outOfOrder(true)
-                .placeholders(Map.of( // FINERACT-773
-                        "fineract_default_tenantdb_hostname", dbHostname, "fineract_default_tenantdb_port", dbPort,
+                // FINERACT-773
+                .placeholders(Map.of("fineract_default_tenantdb_hostname", dbHostname, "fineract_default_tenantdb_port", dbPort,
                         "fineract_default_tenantdb_uid", dbUid, "fineract_default_tenantdb_pwd", dbPwd))
                 .configuration(Map.of("flyway.table", "schema_version")) // FINERACT-979
                 .load();
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsDropdownReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsDropdownReadPlatformServiceImpl.java
index 6a3cee384..6496b68dd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsDropdownReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsDropdownReadPlatformServiceImpl.java
@@ -35,22 +35,19 @@ public class SavingsDropdownReadPlatformServiceImpl implements SavingsDropdownRe
 
     @Override
     public Collection<EnumOptionData> retrievewithdrawalFeeTypeOptions() {
-        final List<EnumOptionData> allowedOptions = Arrays.asList( //
-                SavingsEnumerations.withdrawalFeeType(SavingsWithdrawalFeesType.FLAT), //
-                SavingsEnumerations.withdrawalFeeType(SavingsWithdrawalFeesType.PERCENT_OF_AMOUNT) //
-        );
+        final List<EnumOptionData> allowedOptions = Arrays.asList(SavingsEnumerations.withdrawalFeeType(SavingsWithdrawalFeesType.FLAT),
+                SavingsEnumerations.withdrawalFeeType(SavingsWithdrawalFeesType.PERCENT_OF_AMOUNT));
 
         return allowedOptions;
     }
 
     @Override
     public List<EnumOptionData> retrieveLockinPeriodFrequencyTypeOptions() {
-        final List<EnumOptionData> allowedLockinPeriodFrequencyTypeOptions = Arrays.asList( //
-                SavingsEnumerations.lockinPeriodFrequencyType(SavingsPeriodFrequencyType.DAYS), //
-                SavingsEnumerations.lockinPeriodFrequencyType(SavingsPeriodFrequencyType.WEEKS), //
-                SavingsEnumerations.lockinPeriodFrequencyType(SavingsPeriodFrequencyType.MONTHS), //
-                SavingsEnumerations.lockinPeriodFrequencyType(SavingsPeriodFrequencyType.YEARS) //
-        );
+        final List<EnumOptionData> allowedLockinPeriodFrequencyTypeOptions = Arrays.asList(
+                SavingsEnumerations.lockinPeriodFrequencyType(SavingsPeriodFrequencyType.DAYS),
+                SavingsEnumerations.lockinPeriodFrequencyType(SavingsPeriodFrequencyType.WEEKS),
+                SavingsEnumerations.lockinPeriodFrequencyType(SavingsPeriodFrequencyType.MONTHS),
+                SavingsEnumerations.lockinPeriodFrequencyType(SavingsPeriodFrequencyType.YEARS));
 
         return allowedLockinPeriodFrequencyTypeOptions;
     }
@@ -58,8 +55,7 @@ public class SavingsDropdownReadPlatformServiceImpl implements SavingsDropdownRe
     @Override
     public Collection<EnumOptionData> retrieveCompoundingInterestPeriodTypeOptions() {
         final List<EnumOptionData> allowedOptions = Arrays.asList(
-                //
-                SavingsEnumerations.compoundingInterestPeriodType(SavingsCompoundingInterestPeriodType.DAILY), //
+                SavingsEnumerations.compoundingInterestPeriodType(SavingsCompoundingInterestPeriodType.DAILY),
                 // SavingsEnumerations.compoundingInterestPeriodType(SavingsCompoundingInterestPeriodType.WEEKLY),
                 // //
                 // SavingsEnumerations.compoundingInterestPeriodType(SavingsCompoundingInterestPeriodType.BIWEEKLY),
@@ -78,32 +74,29 @@ public class SavingsDropdownReadPlatformServiceImpl implements SavingsDropdownRe
 
     @Override
     public Collection<EnumOptionData> retrieveInterestPostingPeriodTypeOptions() {
-        final List<EnumOptionData> allowedOptions = Arrays.asList( //
-                SavingsEnumerations.interestPostingPeriodType(SavingsPostingInterestPeriodType.MONTHLY), //
-                SavingsEnumerations.interestPostingPeriodType(SavingsPostingInterestPeriodType.QUATERLY), //
-                SavingsEnumerations.interestPostingPeriodType(SavingsPostingInterestPeriodType.BIANNUAL), //
-                SavingsEnumerations.interestPostingPeriodType(SavingsPostingInterestPeriodType.ANNUAL) //
-        );
+        final List<EnumOptionData> allowedOptions = Arrays.asList(
+                SavingsEnumerations.interestPostingPeriodType(SavingsPostingInterestPeriodType.MONTHLY),
+                SavingsEnumerations.interestPostingPeriodType(SavingsPostingInterestPeriodType.QUATERLY),
+                SavingsEnumerations.interestPostingPeriodType(SavingsPostingInterestPeriodType.BIANNUAL),
+                SavingsEnumerations.interestPostingPeriodType(SavingsPostingInterestPeriodType.ANNUAL));
 
         return allowedOptions;
     }
 
     @Override
     public Collection<EnumOptionData> retrieveInterestCalculationTypeOptions() {
-        final List<EnumOptionData> allowedOptions = Arrays.asList( //
-                SavingsEnumerations.interestCalculationType(SavingsInterestCalculationType.DAILY_BALANCE), //
-                SavingsEnumerations.interestCalculationType(SavingsInterestCalculationType.AVERAGE_DAILY_BALANCE) //
-        );
+        final List<EnumOptionData> allowedOptions = Arrays.asList(
+                SavingsEnumerations.interestCalculationType(SavingsInterestCalculationType.DAILY_BALANCE),
+                SavingsEnumerations.interestCalculationType(SavingsInterestCalculationType.AVERAGE_DAILY_BALANCE));
 
         return allowedOptions;
     }
 
     @Override
     public Collection<EnumOptionData> retrieveInterestCalculationDaysInYearTypeOptions() {
-        final List<EnumOptionData> allowedOptions = Arrays.asList( //
-                SavingsEnumerations.interestCalculationDaysInYearType(SavingsInterestCalculationDaysInYearType.DAYS_360), //
-                SavingsEnumerations.interestCalculationDaysInYearType(SavingsInterestCalculationDaysInYearType.DAYS_365) //
-        );
+        final List<EnumOptionData> allowedOptions = Arrays.asList(
+                SavingsEnumerations.interestCalculationDaysInYearType(SavingsInterestCalculationDaysInYearType.DAYS_360),
+                SavingsEnumerations.interestCalculationDaysInYearType(SavingsInterestCalculationDaysInYearType.DAYS_365));
 
         return allowedOptions;
     }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductDropdownReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductDropdownReadPlatformServiceImpl.java
index 1f7437a8f..e2800e965 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductDropdownReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductDropdownReadPlatformServiceImpl.java
@@ -31,21 +31,19 @@ public class ShareProductDropdownReadPlatformServiceImpl implements ShareProduct
 
     @Override
     public Collection<EnumOptionData> retrieveLockinPeriodFrequencyTypeOptions() {
-        final List<EnumOptionData> allowedLockinPeriodFrequencyTypeOptions = Arrays.asList( //
-                SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.DAYS), //
-                SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.WEEKS), //
-                SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.MONTHS), //
-                SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.YEARS) //
-        );
+        final List<EnumOptionData> allowedLockinPeriodFrequencyTypeOptions = Arrays.asList(
+                SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.DAYS),
+                SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.WEEKS),
+                SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.MONTHS),
+                SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.YEARS));
 
         return allowedLockinPeriodFrequencyTypeOptions;
     }
 
     @Override
     public Collection<EnumOptionData> retrieveMinimumActivePeriodFrequencyTypeOptions() {
-        final List<EnumOptionData> minimumActivePeriodFrequencyTypeOptions = Arrays.asList( //
-                SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.DAYS) //
-        );
+        final List<EnumOptionData> minimumActivePeriodFrequencyTypeOptions = Arrays
+                .asList(SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.DAYS));
 
         return minimumActivePeriodFrequencyTypeOptions;
     }