diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/common/PluginConstants.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/common/PluginConstants.java
index f115bb6cb4..92573902d9 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/common/PluginConstants.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/common/PluginConstants.java
@@ -327,13 +327,12 @@ public final class PluginConstants {
     }
 
     /**
-     * Windows version related constants.
+     * Windows version(8.1/10) related constants.
      */
     public final class WindowsVersionProperties {
         private WindowsVersionProperties() {
             throw new AssertionError();
         }
-
         public static final String REQUESTED_WIN10_VERSION = "3.0";
         public static final String REQUESTED_WIN81_VERSION = "2.0";
     }
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/operations/util/OperationCode.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/operations/util/OperationCode.java
index a9f4a14344..8ba4b44162 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/operations/util/OperationCode.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/operations/util/OperationCode.java
@@ -46,7 +46,6 @@ public class OperationCode {
         LONGITUDE("./Vendor/MSFT/RemoteFind/Location/Longitude"),
         LATITUDE("./Vendor/MSFT/RemoteFind/Location/Latitude"),
 
-
         // Windows10 operation codes
         TOTAL_RAM("./DevDetail/Ext/Microsoft/TotalRAM"),
         TOTAL_STORAGE("./DevDetail/Ext/Microsoft/TotalStorage"),
@@ -82,7 +81,7 @@ public class OperationCode {
         ENCRYPT_STORAGE_STATUS("./Vendor/MSFT/PolicyManager/Device/Security/RequireDeviceEncryption"),
         DEVICE_PASSWORD_ENABLE("./Vendor/MSFT/PolicyManager/My/DeviceLock/DevicePasswordEnabled"),
         DEVICE_PASSCODE_DELETE("./Vendor/MSFT/PolicyManager/My/DeviceLock"),
-        // windows 10
+        // Windows10 operation codes
         TOTAL_RAM("./DevDetail/Ext/Microsoft/TotalRAM"),
         TOTAL_STORAGE("./DevDetail/Ext/Microsoft/TotalStorage"),
         OS_PLATFORM("./DevDetail/Ext/Microsoft/OSPlatform"),
@@ -94,7 +93,6 @@ public class OperationCode {
         BATTERY_ESTIMATED_RUNTIME("./Vendor/MSFT/DeviceStatus/Battery/EstimatedRuntime"),
         TEST("./Vendor/MSFT/DiagnosticLog/EtwLog/Collectors");
 
-
         private final String code;
 
         Command(String code) {
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/operations/util/OperationHandler.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/operations/util/OperationHandler.java
index 99b9ef68ae..8b0db02223 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/operations/util/OperationHandler.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/operations/util/OperationHandler.java
@@ -229,7 +229,7 @@ public class OperationHandler {
         try {
             pendingDeviceInfoOperations = WindowsAPIUtils.getPendingOperations(deviceIdentifier);
         } catch (DeviceManagementException e) {
-            throw new OperationManagementException("Error occurred in getting pending operation.");
+            throw new OperationManagementException("Error occurred while getting pending operations.");
         }
         for (Operation operation : pendingDeviceInfoOperations) {
             if (PluginConstants.OperationCodes.DEVICE_INFO.equals(operation.getCode())) {