diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/device-api.jag b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/device-api.jag
index 84a9b98bdc7..a214f536e9d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/device-api.jag
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/device-api.jag
@@ -74,13 +74,13 @@ if (!user) {
         } else {
             result = 400;
         }
-    }else if (uriMatcher.match("/{context}/api/devices/sketch/generate_link")) {
+    } else if (uriMatcher.match("/{context}/api/devices/sketch/generate_link")) {
 
         if (!request.getContent()){
             log.error("Request Payload Is Empty");
             // HTTP status code 400 refers to - Bad request.
             result = 400;
-        }else{
+        } else{
             deviceType = request.getContent()["deviceType"];
             queryString = "?deviceName=" + request.getContent()["deviceName"] +"&deviceType="+
                 request.getContent()["deviceType"]+"&sketchType="+request.getContent()["sketchType"];
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/public/js/operation-bar.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/public/js/operation-bar.js
index a892a32ff88..8d1a9475be7 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/public/js/operation-bar.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/public/js/operation-bar.js
@@ -52,22 +52,21 @@ function submitForm(formId) {
             uriencodedQueryStr += prefix + input.attr("id") + "=" + input.val();
         } else if (input.data("param-type") == "form") {
             var prefix = (uriencodedFormStr == "") ? "" : "&";
-            if (input.attr("type") == "checkbox" || input.attr("type") == "radio"){
-
-                if (isItemSelected == undefined){
+            if (input.attr("type") == "checkbox" || input.attr("type") == "radio") {
+                if (isItemSelected == undefined) {
                     isItemSelected = false;
                 }
-                if (input.is(':checked')){
+                if (input.is(':checked')) {
                     isItemSelected = true;
                     uriencodedFormStr += prefix + input.attr("name") + "=" + input.val();
                 }
-            }else{
+            } else {
                 uriencodedFormStr += prefix + input.attr("id") + "=" + input.val();
             }
         }
     });
 
-    if (isItemSelected === false){
+    if (isItemSelected === false) {
         title.html("Please Select One Option");
         statusIcon.attr("class", defaultStatusClasses + " fw-error");
         $(modalPopupContent).html(content.html());