diff --git a/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/OrganizationTiers.java b/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/OrganizationTiers.java
index e280c330e569..fd602604eb47 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/OrganizationTiers.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/OrganizationTiers.java
@@ -20,7 +20,7 @@
 import java.util.Set;
 
 /**
- * This class represent the Tier
+ * This class represent Organization Tiers
  */
 public class OrganizationTiers {
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConsumerImpl.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConsumerImpl.java
index dd7383590c54..7e94b505fd8a 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConsumerImpl.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConsumerImpl.java
@@ -4049,7 +4049,8 @@ private API addTiersToAPI(API api, String organization) throws APIManagementExce
             Set<OrganizationTiers> organizationTiersSet = api.getAvailableTiersForOrganizations();
             for (OrganizationTiers organizationTiers : organizationTiersSet) {
                 Set<Tier> tierNamesForOrganization = organizationTiers.getTiers();
-                Set<Tier> availableTiersForOrganization = getAvailableTiers(tierNamesForOrganization, deniedTiers, definedTiers);
+                Set<Tier> availableTiersForOrganization = getAvailableTiers(tierNamesForOrganization, deniedTiers,
+                        definedTiers);
                 organizationTiers.removeAllTiers();
                 organizationTiers.setTiers(availableTiersForOrganization);
             }
diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java
index ecc045df1305..386e5ded55e3 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java
@@ -3598,6 +3598,11 @@ public static float getAverageRating(int apiId) throws APIManagementException {
         return ApiMgtDAO.getInstance().getAverageRating(apiId);
     }
 
+    /**
+     * Update available tiers in the DevPortalAPIInfo according to the organization.
+     * @param devPortalAPIInfo  DevPortalAPIInfo object
+     * @param organization      Organization ID
+     */
     public static void updateAvailableTiersByOrganization(DevPortalAPIInfo devPortalAPIInfo, String organization) {
 
         Set<String> availableTiers = devPortalAPIInfo.getAvailableTierNames();
diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/dto/DevPortalAPIInfo.java b/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/dto/DevPortalAPIInfo.java
index aface03db92d..aab9f6562622 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/dto/DevPortalAPIInfo.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/dto/DevPortalAPIInfo.java
@@ -18,10 +18,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.apimgt.api.model.API;
 import org.wso2.carbon.apimgt.api.model.Tier;
 
-import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/utils/APIUtils.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/utils/APIUtils.java
index b7054d018495..728ec19853f8 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/utils/APIUtils.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/utils/APIUtils.java
@@ -221,20 +221,25 @@ public static List<KeyManagerConfigurationDTO> filterAllowedKeyManagersForOrgani
         return allowedList;
     }
 
-public static void updateAvailableTiersByOrganization(API api, String organization) {
-
-    Set<Tier> availableTiers = api.getAvailableTiers();
-    Set<OrganizationTiers> availableTiersForOrganizations = api.getAvailableTiersForOrganizations();
-    if (organization != null) {
-        for (OrganizationTiers organizationTiers : availableTiersForOrganizations) {
-            String orgName = organizationTiers.getOrganizationID();
-            if (organization.equals(orgName)) {
-                availableTiers = organizationTiers.getTiers();
-                break;
+    /**
+     * Update available tiers in the API according to the organization.
+     * @param api           API object
+     * @param organization  Organization name
+     */
+    public static void updateAvailableTiersByOrganization(API api, String organization) {
+
+        Set<Tier> availableTiers = api.getAvailableTiers();
+        Set<OrganizationTiers> availableTiersForOrganizations = api.getAvailableTiersForOrganizations();
+        if (organization != null) {
+            for (OrganizationTiers organizationTiers : availableTiersForOrganizations) {
+                String orgName = organizationTiers.getOrganizationID();
+                if (organization.equals(orgName)) {
+                    availableTiers = organizationTiers.getTiers();
+                    break;
+                }
             }
         }
+        api.removeAllTiers();
+        api.setAvailableTiers(availableTiers);
     }
-    api.removeAllTiers();
-    api.setAvailableTiers(availableTiers);
-}
 }