diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
index 378125a..6ef521c 100644
--- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
+++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
@@ -81,29 +81,29 @@
       "type": "string",
       "defaultValue": "0.0.40",
       "allowedValues": [
-	    "0.0.8",
+        "0.0.8",
         "0.0.9",
-	    "0.0.10",
-	    "0.0.11",
-	    "0.0.12",
-	    "0.0.14",
-	    "0.0.15",
-	    "0.0.18",
-	    "0.0.19",
-	    "0.0.21",
-	    "0.0.22",
-	    "0.0.23",
-	    "0.0.25",
-	    "0.0.27",
-	    "0.0.28",
-	    "0.0.29",
-	    "0.0.30",
-	    "0.0.32",
-	    "0.0.33",
-	    "0.0.34",
-	    "0.0.35",
-	    "0.0.37",
-	    "0.0.38",
+        "0.0.10",
+        "0.0.11",
+        "0.0.12",
+        "0.0.14",
+        "0.0.15",
+        "0.0.18",
+        "0.0.19",
+        "0.0.21",
+        "0.0.22",
+        "0.0.23",
+        "0.0.25",
+        "0.0.27",
+        "0.0.28",
+        "0.0.29",
+        "0.0.30",
+        "0.0.32",
+        "0.0.33",
+        "0.0.34",
+        "0.0.35",
+        "0.0.37",
+        "0.0.38",
         "0.0.39",
         "0.0.40"
       ],
@@ -179,7 +179,7 @@
     },
     "certificateKey": {
       "type": "securestring",
-      "metadata":  {
+      "metadata": {
         "description": "Provide your SSL Certificate key"
       }
     },
@@ -187,7 +187,7 @@
       "type": "string",
       "minLength": 1,
       "defaultValue": "artifactory",
-      "metadata":  {
+      "metadata": {
         "description": "Provide your Certificate Domain Name. For e.g jfrog.team for certificate with *.jfrog.team"
       }
     },
@@ -195,7 +195,7 @@
       "type": "string",
       "minLength": 1,
       "defaultValue": "artifactory",
-      "metadata":  {
+      "metadata": {
         "description": "Provide artifactory server name to be used in Nginx. e.g artifactory for artifactory.jfrog.team"
       }
     },
@@ -203,7 +203,7 @@
       "type": "string",
       "minLength": 1,
       "defaultValue": "-server -Xms2g -Xmx8g -Xss256k -XX:+UseG1GC -XX:OnOutOfMemoryError=\\\"kill -9 %p\\\"",
-      "metadata":  {
+      "metadata": {
         "description": "Setting Java Memory Parameters for Artifactory. Learn about system requirements for Artifactory https://www.jfrog.com/confluence/display/RTF/System+Requirements#SystemRequirements-RecommendedHardware."
       }
     },
@@ -552,7 +552,7 @@
         "[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]",
         "[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipMemberName'))]"
       ],
-      "tags":{
+      "tags": {
         "displayName": "Load Balancer"
       },
       "properties": {
@@ -740,7 +740,7 @@
       "sku": {
         "name": "[parameters('storageAccountType')]"
       },
-      "tags":{
+      "tags": {
         "displayName": "Artifactory Storage Account"
       },
       "kind": "Storage",
diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
index a3e26d3..11dfd92 100644
--- a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
+++ b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
@@ -176,45 +176,45 @@
                   "value": "0.0.24"
                 },
                 {
-	              "label": "3.29.0",
+                  "label": "3.29.0",
                   "value": "0.0.25"
-	            },
-		        {
-		          "label": "3.29.2",
-		          "value": "0.0.26"
-		        },
-		        {
-                  "label": "3.32.2",
-		          "value": "0.0.27"
-		        },
-		        {
-		          "label": "3.33.3",
-		          "value": "0.0.28"
                 },
-		        {
-		          "label": "3.34.1",
-		          "value": "0.0.29"
-		        },
-		        {
-		          "label": "3.35.0",
-		          "value": "0.0.30"
-		        },
-		        {
-		          "label": "3.37.2",
-		          "value": "0.0.31"
-		        },
-		        {
+                {
+                  "label": "3.29.2",
+                  "value": "0.0.26"
+                },
+                {
+                  "label": "3.32.2",
+                  "value": "0.0.27"
+                },
+                {
+                  "label": "3.33.3",
+                  "value": "0.0.28"
+                },
+                {
+                  "label": "3.34.1",
+                  "value": "0.0.29"
+                },
+                {
+                  "label": "3.35.0",
+                  "value": "0.0.30"
+                },
+                {
+                  "label": "3.37.2",
+                  "value": "0.0.31"
+                },
+                {
                   "label": "3.38.2",
                   "value": "0.0.32"
                 },
-		        {
-		          "label": "3.41.4",
-		          "value": "0.0.33"
-		        },
-		        {
-		          "label": "3.42.5",
-		          "value": "0.0.34"
-		        }
+                {
+                  "label": "3.41.4",
+                  "value": "0.0.33"
+                },
+                {
+                  "label": "3.42.5",
+                  "value": "0.0.34"
+                }
               ],
               "required": true
             },
diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
index 8435536..d790a95 100644
--- a/AzureResourceManager/Xray/MP_submission/mainTemplate.json
+++ b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
@@ -34,15 +34,15 @@
         "0.0.23",
         "0.0.24",
         "0.0.25",
-	    "0.0.26",
+        "0.0.26",
         "0.0.27",
         "0.0.28",
-	    "0.0.29",
+        "0.0.29",
         "0.0.30",
-	    "0.0.31",
+        "0.0.31",
         "0.0.32",
-	    "0.0.33",
-	    "0.0.34"
+        "0.0.33",
+        "0.0.34"
       ],
       "metadata": {
         "description": "Xray-vm image version to deploy."
diff --git a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
index 93b439c..15ef84b 100644
--- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
+++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
@@ -34,14 +34,14 @@
         "0.0.23",
         "0.0.24",
         "0.0.25",
-	    "0.0.26",
-	    "0.0.27",
-	    "0.0.28",
-	    "0.0.29",
-	    "0.0.30",
-	    "0.0.31",
-	    "0.0.32",
-	    "0.0.33",
+        "0.0.26",
+        "0.0.27",
+        "0.0.28",
+        "0.0.29",
+        "0.0.30",
+        "0.0.31",
+        "0.0.32",
+        "0.0.33",
         "0.0.34"
       ],
       "metadata": {