diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java
index 1c0dba69ff..7a451ec564 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java
@@ -18,42 +18,62 @@ package org.wso2.carbon.device.mgt.common;
 public final class DeviceManagementConstants {
 
     public static final class DataSourceProperties {
+
         private DataSourceProperties() {
             throw new AssertionError();
         }
+
         public static final String DB_CHECK_QUERY = "SELECT * FROM DM_DEVICE";
         public static final String SECURE_VAULT_NS = "http://org.wso2.securevault/configuration";
         public static final String DEVICE_CONFIG_XML_NAME = "cdm-config.xml";
     }
 
     public static final class SecureValueProperties {
+
         private SecureValueProperties() {
             throw new AssertionError();
         }
+
         public static final String SECRET_ALIAS_ATTRIBUTE_NAME_WITH_NAMESPACE = "secretAlias";
         public static final String SECURE_VAULT_NS = "http://org.wso2.securevault/configuration";
     }
 
     public static final class MobileDeviceTypes {
+
         private MobileDeviceTypes() {
             throw new AssertionError();
         }
+
         public final static String MOBILE_DEVICE_TYPE_ANDROID = "android";
         public final static String MOBILE_DEVICE_TYPE_IOS = "ios";
         public final static String MOBILE_DEVICE_TYPE_WINDOWS = "windows";
     }
 
-    public static final class LanguageCodes{
-        private LanguageCodes() { throw new AssertionError();}
+    public static final class LanguageCodes {
+
+        private LanguageCodes() {
+            throw new AssertionError();
+        }
+
         public final static String LANGUAGE_CODE_ENGLISH_US = "en-us";
         public final static String LANGUAGE_CODE_ENGLISH_UK = "en-uk";
     }
 
-    public static final class DefaultLicences{
+    public static final class DefaultLicences {
+
+        private DefaultLicences() {
+            throw new AssertionError();
+        }
+
         public static final String DEFAULT_LICENSE_CONFIG_XML_NAME = "DefaultLicense.xml";
     }
 
-    public static final class LicenseProperties{
+    public static final class LicenseProperties {
+
+        private LicenseProperties() {
+            throw new AssertionError();
+        }
+        
         public static final String OVERVIEW_PROVIDER = "overview_provider";
         public static final String OVERVIEW_NAME = "overview_name";
         public static final String OVERVIEW_LANGUAGE = "overview_language";