diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java
index 5db5baa8b9..119a452179 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java
@@ -118,8 +118,8 @@ public class AndroidDeviceManager implements DeviceManager {
 				JAXBContext context = JAXBContext.newInstance(TenantConfiguration.class);
 				Unmarshaller unmarshaller = context.createUnmarshaller();
 				return (TenantConfiguration) unmarshaller.unmarshal(
-						new StringReader(new String((byte[]) resource.getContent(), Charset
-								.forName(MobilePluginConstants.CHARSET_UTF8))));
+						new StringReader(new String((byte[]) resource.getContent(), Charset.
+								forName(MobilePluginConstants.CHARSET_UTF8))));
 			}
 			return new TenantConfiguration();
 		} catch (MobileDeviceMgtPluginException e) {
@@ -161,7 +161,6 @@ public class AndroidDeviceManager implements DeviceManager {
 			}
 			String msg =
 					"Error while enrolling the Android device : " + device.getDeviceIdentifier();
-			log.error(msg, e);
 			throw new DeviceManagementException(msg, e);
 		}
 		return status;
@@ -188,7 +187,6 @@ public class AndroidDeviceManager implements DeviceManager {
 			}
 			String msg = "Error while updating the enrollment of the Android device : " +
 			             device.getDeviceIdentifier();
-			log.error(msg, e);
 			throw new DeviceManagementException(msg, e);
 		}
 		return status;
@@ -213,7 +211,6 @@ public class AndroidDeviceManager implements DeviceManager {
 				log.warn(msg, mobileDAOEx);
 			}
 			String msg = "Error while removing the Android device : " + deviceId.getId();
-			log.error(msg, e);
 			throw new DeviceManagementException(msg, e);
 		}
 		return status;
@@ -234,7 +231,6 @@ public class AndroidDeviceManager implements DeviceManager {
 		} catch (MobileDeviceManagementDAOException e) {
 			String msg = "Error while checking the enrollment status of Android device : " +
 			             deviceId.getId();
-			log.error(msg, e);
 			throw new DeviceManagementException(msg, e);
 		}
 		return isEnrolled;
@@ -288,8 +284,8 @@ public class AndroidDeviceManager implements DeviceManager {
 
 	@Override
 	public License getLicense(String languageCode) throws LicenseManagementException {
-		return licenseManager
-				.getLicense(AndroidDeviceManagementService.DEVICE_TYPE_ANDROID, languageCode);
+		return licenseManager.
+				getLicense(AndroidDeviceManagementService.DEVICE_TYPE_ANDROID, languageCode);
 	}
 
 	@Override
@@ -320,8 +316,7 @@ public class AndroidDeviceManager implements DeviceManager {
 						"updating the details of Android device : " + device.getDeviceIdentifier());
 			}
 			AndroidDAOFactory.beginTransaction();
-			status = daoFactory.getMobileDeviceDAO()
-			                   .updateMobileDevice(existingMobileDevice);
+			status = daoFactory.getMobileDeviceDAO().updateMobileDevice(existingMobileDevice);
 			AndroidDAOFactory.commitTransaction();
 		} catch (MobileDeviceManagementDAOException e) {
 			try {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidPolicyMonitoringService.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidPolicyMonitoringService.java
index acc7337c2d..3c58c0c6e2 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidPolicyMonitoringService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidPolicyMonitoringService.java
@@ -72,7 +72,7 @@ public class AndroidPolicyMonitoringService implements PolicyMonitoringService {
         complianceData.setComplianceFeatures(complianceFeatures);
 
         for (ComplianceFeature cf : complianceFeatures) {
-            if (!cf.isCompliance()) {
+            if (!cf.isCompliant()) {
                 complianceData.setStatus(false);
                 break;
             }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidUtils.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidUtils.java
index d177680993..48753ed4c5 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidUtils.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidUtils.java
@@ -26,8 +26,6 @@ import java.util.Map;
 public class AndroidUtils {
 
 	public static String getDeviceProperty(Map<String, String> deviceProperties, String property) {
-
-		String deviceProperty = deviceProperties.get(property);
-		return deviceProperty;
+		return deviceProperties.get(property);
 	}
 }
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/h2_android.sql b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/h2_android.sql
index f7b2d1818e..3cef91277e 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/h2_android.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/h2_android.sql
@@ -3,30 +3,30 @@
 -- Table `AD_DEVICE`
 -- -----------------------------------------------------
 CREATE  TABLE IF NOT EXISTS `AD_DEVICE` (
-  `ANDROID_DEVICE_ID` VARCHAR(45) NOT NULL ,
-  `GCM_TOKEN` VARCHAR(1000) NULL DEFAULT NULL ,
-  `DEVICE_INFO` VARCHAR(8000) NULL DEFAULT NULL ,
-  `IMEI` VARCHAR(45) NULL DEFAULT NULL ,
-  `IMSI` VARCHAR(45) NULL DEFAULT NULL ,
-  `OS_VERSION` VARCHAR(45) NULL DEFAULT NULL ,
-  `DEVICE_MODEL` VARCHAR(45) NULL DEFAULT NULL ,
-  `VENDOR` VARCHAR(45) NULL DEFAULT NULL ,
+  `ANDROID_DEVICE_ID` VARCHAR(45) NOT NULL,
+  `GCM_TOKEN` VARCHAR(45) NULL DEFAULT NULL,
+  `DEVICE_INFO` VARCHAR(8000) NULL DEFAULT NULL,
+  `IMEI` VARCHAR(45) NULL DEFAULT NULL,
+  `IMSI` VARCHAR(45) NULL DEFAULT NULL,
+  `OS_VERSION` VARCHAR(45) NULL DEFAULT NULL,
+  `DEVICE_MODEL` VARCHAR(45) NULL DEFAULT NULL,
+  `VENDOR` VARCHAR(45) NULL DEFAULT NULL,
   `LATITUDE` VARCHAR(45) NULL DEFAULT NULL,
   `LONGITUDE` VARCHAR(45) NULL DEFAULT NULL,
   `SERIAL` VARCHAR(45) NULL DEFAULT NULL,
   `MAC_ADDRESS` VARCHAR(45) NULL DEFAULT NULL,
   `DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
-  PRIMARY KEY (`ANDROID_DEVICE_ID`) );
+  PRIMARY KEY (`ANDROID_DEVICE_ID`));
 
 -- -----------------------------------------------------
 -- Table `AD_FEATURE`
 -- -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS `AD_FEATURE` (
-  `ID` INT NOT NULL AUTO_INCREMENT ,
+  `ID` INT NOT NULL AUTO_INCREMENT,
   `CODE` VARCHAR(45) NOT NULL,
-  `NAME` VARCHAR(100) NULL ,
-  `DESCRIPTION` VARCHAR(200) NULL ,
-  PRIMARY KEY (`ID`) );
+  `NAME` VARCHAR(100) NULL,
+  `DESCRIPTION` VARCHAR(200) NULL,
+  PRIMARY KEY (`ID`));
 
 
 -- -----------------------------------------------------
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/h2_windows.sql b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/h2_windows.sql
index 4268b07314..638f3bf67c 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/h2_windows.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/h2_windows.sql
@@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS `WINDOWS_FEATURE` (
   `CODE` VARCHAR(45) NOT NULL,
   `NAME` VARCHAR(100) NULL,
   `DESCRIPTION` VARCHAR(200) NULL,
-  PRIMARY KEY (`FEATURE_ID`) );
+  PRIMARY KEY (`FEATURE_ID`));
 
 
 -- -----------------------------------------------------
@@ -16,12 +16,12 @@ CREATE TABLE IF NOT EXISTS `WINDOWS_FEATURE` (
   CREATE  TABLE IF NOT EXISTS `WINDOWS_DEVICE` (
   `MOBILE_DEVICE_ID` VARCHAR(45) NOT NULL,
   `CHANNEL_URI` VARCHAR(100) NULL DEFAULT NULL,
-  `DEVICE_INFO` VARCHAR(8000) NULL DEFAULT NULL ,
-  `IMEI` VARCHAR(45) NULL DEFAULT NULL ,
-  `IMSI` VARCHAR(45) NULL DEFAULT NULL ,
-  `OS_VERSION` VARCHAR(45) NULL DEFAULT NULL ,
-  `DEVICE_MODEL` VARCHAR(45) NULL DEFAULT NULL ,
-  `VENDOR` VARCHAR(45) NULL DEFAULT NULL ,
+  `DEVICE_INFO` VARCHAR(8000) NULL DEFAULT NULL,
+  `IMEI` VARCHAR(45) NULL DEFAULT NULL,
+  `IMSI` VARCHAR(45) NULL DEFAULT NULL,
+  `OS_VERSION` VARCHAR(45) NULL DEFAULT NULL,
+  `DEVICE_MODEL` VARCHAR(45) NULL DEFAULT NULL,
+  `VENDOR` VARCHAR(45) NULL DEFAULT NULL,
   `LATITUDE` VARCHAR(45) NULL DEFAULT NULL,
   `LONGITUDE` VARCHAR(45) NULL DEFAULT NULL,
   `SERIAL` VARCHAR(45) NULL DEFAULT NULL,
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/mysql_android.sql b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/mysql_android.sql
index ae1211862c..2c5ed863ce 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/mysql_android.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/mysql_android.sql
@@ -3,13 +3,13 @@
 -- -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS `AD_DEVICE` (
   `ANDROID_DEVICE_ID` VARCHAR(45) NOT NULL ,
-  `DEVICE_INFO` VARCHAR(500) NULL DEFAULT NULL ,
-  `GCM_TOKEN` VARCHAR(1000) NULL DEFAULT NULL ,
-  `IMEI` VARCHAR(45) NULL DEFAULT NULL ,
-  `IMSI` VARCHAR(45) NULL DEFAULT NULL ,
-  `OS_VERSION` VARCHAR(45) NULL DEFAULT NULL ,
-  `DEVICE_MODEL` VARCHAR(45) NULL DEFAULT NULL ,
-  `VENDOR` VARCHAR(45) NULL DEFAULT NULL ,
+  `DEVICE_INFO` VARCHAR(500) NULL DEFAULT NULL,
+  `GCM_TOKEN` VARCHAR(45) NULL DEFAULT NULL,
+  `IMEI` VARCHAR(45) NULL DEFAULT NULL,
+  `IMSI` VARCHAR(45) NULL DEFAULT NULL,
+  `OS_VERSION` VARCHAR(45) NULL DEFAULT NULL,
+  `DEVICE_MODEL` VARCHAR(45) NULL DEFAULT NULL,
+  `VENDOR` VARCHAR(45) NULL DEFAULT NULL,
   `LATITUDE` VARCHAR(45) NULL DEFAULT NULL,
   `LONGITUDE` VARCHAR(45) NULL DEFAULT NULL,
   `SERIAL` VARCHAR(45) NULL DEFAULT NULL,
@@ -23,10 +23,10 @@ ENGINE = InnoDB;
 -- Table `MBL_FEATURE`
 -- -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS `AD_FEATURE` (
-  `ID` INT NOT NULL AUTO_INCREMENT ,
+  `ID` INT NOT NULL AUTO_INCREMENT,
   `CODE` VARCHAR(45) NOT NULL,
-  `NAME` VARCHAR(100) NULL ,
-  `DESCRIPTION` VARCHAR(200) NULL ,
+  `NAME` VARCHAR(100) NULL,
+  `DESCRIPTION` VARCHAR(200) NULL,
   PRIMARY KEY (`ID`))
 ENGINE = InnoDB;
 
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/mysql_windows.sql b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/mysql_windows.sql
index e69dc48ad1..dfabdc0090 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/mysql_windows.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/mysql_windows.sql
@@ -24,7 +24,7 @@ ENGINE = InnoDB;
 -- -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS `MBL_FEATURE` (
   `FEATURE_ID` INT NOT NULL AUTO_INCREMENT,
-  `DEVICE_TYPE` VARCHAR(45) NOT NULL ,
+  `DEVICE_TYPE` VARCHAR(45) NOT NULL,
   `CODE` VARCHAR(45) NULL,
   `NAME` VARCHAR(100) NULL,
   `DESCRIPTION` VARCHAR(200) NULL,