diff --git a/terraform-allinone-azure/allinone.tf b/terraform-allinone-azure/allinone.tf
index bce5f92..f6cf126 100644
--- a/terraform-allinone-azure/allinone.tf
+++ b/terraform-allinone-azure/allinone.tf
@@ -27,18 +27,18 @@ resource "azurerm_windows_virtual_machine" "allinone" {
   size                  = "Standard_B2s"
 
   os_disk {
-    caching       = "ReadWrite"
+    caching              = "ReadWrite"
     storage_account_type = "Standard_LRS"
   }
 
   computer_name  = "allinone"
-  admin_username = "${var.admin_user}"
-  admin_password = "${var.admin_pass}"
+  admin_username = var.admin_user
+  admin_password = var.admin_pass
 
   source_image_id = "/subscriptions/${var.subscription_id}/resourceGroups/NetworkWatcherRG/providers/Microsoft.Compute/images/dynamics"
 
   additional_unattend_content {
-    setting      = "AutoLogon"
-    content      = "<AutoLogon><Password><Value>${var.admin_pass}</Value></Password><Enabled>true</Enabled><Username>${var.admin_user}</Username></AutoLogon>"
+    setting = "AutoLogon"
+    content = "<AutoLogon><Password><Value>${var.admin_pass}</Value></Password><Enabled>true</Enabled><Username>${var.admin_user}</Username></AutoLogon>"
   }
 }
diff --git a/terraform-allinone-azure/provider.tf b/terraform-allinone-azure/provider.tf
index 9ea4b73..5ff882a 100644
--- a/terraform-allinone-azure/provider.tf
+++ b/terraform-allinone-azure/provider.tf
@@ -2,9 +2,9 @@ provider "azurerm" {
   version = "~>2.0"
   features {
   }
-  client_id       = "${var.client_id}"
-  client_secret   = "${var.client_secret}"
-  tenant_id       = "${var.tenant_id}"
-  subscription_id = "${var.subscription_id}"
+  client_id       = var.client_id
+  client_secret   = var.client_secret
+  tenant_id       = var.tenant_id
+  subscription_id = var.subscription_id
 }
 
diff --git a/terraform-allinone-azure/variable.tf b/terraform-allinone-azure/variable.tf
index dfe4a99..290f295 100644
--- a/terraform-allinone-azure/variable.tf
+++ b/terraform-allinone-azure/variable.tf
@@ -1,29 +1,29 @@
-variable client_id {
+variable "client_id" {
   type        = string
   description = "Azure Client ID"
 }
 
-variable client_secret {
+variable "client_secret" {
   type        = string
   description = "Azure Client Secret"
 }
 
-variable tenant_id {
+variable "tenant_id" {
   type        = string
   description = "Azure Tenant ID"
 }
 
-variable subscription_id {
+variable "subscription_id" {
   type        = string
   description = "Azure Subscription ID"
 }
 
-variable admin_user {
+variable "admin_user" {
   type        = string
   description = "Admin username"
 }
 
-variable admin_pass {
+variable "admin_pass" {
   type        = string
   description = "Admin password"
 }
diff --git a/terraform-allinone/provider.tf b/terraform-allinone/provider.tf
index 379ace3..2cb2c34 100644
--- a/terraform-allinone/provider.tf
+++ b/terraform-allinone/provider.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     virtualbox = {
-      source = "terra-farm/virtualbox"
+      source  = "terra-farm/virtualbox"
       version = "0.2.2-alpha.1"
     }
   }
diff --git a/terraform-allinone/variables.tf b/terraform-allinone/variables.tf
index 067e5d0..76b9462 100644
--- a/terraform-allinone/variables.tf
+++ b/terraform-allinone/variables.tf
@@ -1,9 +1,9 @@
-variable netdev {
+variable "netdev" {
   type        = string
   description = "Default network adapter to use"
 }
 
-variable branch {
+variable "branch" {
   type        = string
   description = "Git branch in use"
 }
diff --git a/terraform-azure/dynadir.tf b/terraform-azure/dynadir.tf
index 6b84648..7e77165 100644
--- a/terraform-azure/dynadir.tf
+++ b/terraform-azure/dynadir.tf
@@ -27,18 +27,18 @@ resource "azurerm_windows_virtual_machine" "dynadir" {
   size                  = "Standard_B2s"
 
   os_disk {
-    caching       = "ReadWrite"
+    caching              = "ReadWrite"
     storage_account_type = "Standard_LRS"
   }
 
   computer_name  = "dynadir"
-  admin_username = "${var.admin_user}"
-  admin_password = "${var.admin_pass}"
+  admin_username = var.admin_user
+  admin_password = var.admin_pass
 
   source_image_id = "/subscriptions/${var.subscription_id}/resourceGroups/NetworkWatcherRG/providers/Microsoft.Compute/images/dynamics"
 
   additional_unattend_content {
-    setting      = "AutoLogon"
-    content      = "<AutoLogon><Password><Value>${var.admin_pass}</Value></Password><Enabled>true</Enabled><Username>${var.admin_user}</Username></AutoLogon>"
+    setting = "AutoLogon"
+    content = "<AutoLogon><Password><Value>${var.admin_pass}</Value></Password><Enabled>true</Enabled><Username>${var.admin_user}</Username></AutoLogon>"
   }
 }
diff --git a/terraform-azure/dynadm.tf b/terraform-azure/dynadm.tf
index 95a794f..c7cf6f9 100644
--- a/terraform-azure/dynadm.tf
+++ b/terraform-azure/dynadm.tf
@@ -27,18 +27,18 @@ resource "azurerm_windows_virtual_machine" "dynadm" {
   size                  = "Standard_B2s"
 
   os_disk {
-    caching       = "ReadWrite"
+    caching              = "ReadWrite"
     storage_account_type = "Standard_LRS"
   }
 
   computer_name  = "dynadm"
-  admin_username = "${var.admin_user}"
-  admin_password = "${var.admin_pass}"
+  admin_username = var.admin_user
+  admin_password = var.admin_pass
 
   source_image_id = "/subscriptions/${var.subscription_id}/resourceGroups/NetworkWatcherRG/providers/Microsoft.Compute/images/dynamics"
 
   additional_unattend_content {
-    setting      = "AutoLogon"
-    content      = "<AutoLogon><Password><Value>${var.admin_pass}</Value></Password><Enabled>true</Enabled><Username>${var.admin_user}</Username></AutoLogon>"
+    setting = "AutoLogon"
+    content = "<AutoLogon><Password><Value>${var.admin_pass}</Value></Password><Enabled>true</Enabled><Username>${var.admin_user}</Username></AutoLogon>"
   }
 }
diff --git a/terraform-azure/dynbe.tf b/terraform-azure/dynbe.tf
index 2b33c1d..ff2de69 100644
--- a/terraform-azure/dynbe.tf
+++ b/terraform-azure/dynbe.tf
@@ -27,18 +27,18 @@ resource "azurerm_windows_virtual_machine" "dynbe" {
   size                  = "Standard_B2s"
 
   os_disk {
-    caching       = "ReadWrite"
+    caching              = "ReadWrite"
     storage_account_type = "Standard_LRS"
   }
 
   computer_name  = "dynbe"
-  admin_username = "${var.admin_user}"
-  admin_password = "${var.admin_pass}"
+  admin_username = var.admin_user
+  admin_password = var.admin_pass
 
   source_image_id = "/subscriptions/${var.subscription_id}/resourceGroups/NetworkWatcherRG/providers/Microsoft.Compute/images/dynamics"
 
   additional_unattend_content {
-    setting      = "AutoLogon"
-    content      = "<AutoLogon><Password><Value>${var.admin_pass}</Value></Password><Enabled>true</Enabled><Username>${var.admin_user}</Username></AutoLogon>"
+    setting = "AutoLogon"
+    content = "<AutoLogon><Password><Value>${var.admin_pass}</Value></Password><Enabled>true</Enabled><Username>${var.admin_user}</Username></AutoLogon>"
   }
 }
diff --git a/terraform-azure/dynfe.tf b/terraform-azure/dynfe.tf
index a4d50d5..4da96d4 100644
--- a/terraform-azure/dynfe.tf
+++ b/terraform-azure/dynfe.tf
@@ -27,18 +27,18 @@ resource "azurerm_windows_virtual_machine" "dynfe" {
   size                  = "Standard_B2s"
 
   os_disk {
-    caching       = "ReadWrite"
+    caching              = "ReadWrite"
     storage_account_type = "Standard_LRS"
   }
 
   computer_name  = "dynfe"
-  admin_username = "${var.admin_user}"
-  admin_password = "${var.admin_pass}"
+  admin_username = var.admin_user
+  admin_password = var.admin_pass
 
   source_image_id = "/subscriptions/${var.subscription_id}/resourceGroups/NetworkWatcherRG/providers/Microsoft.Compute/images/dynamics"
 
   additional_unattend_content {
-    setting      = "AutoLogon"
-    content      = "<AutoLogon><Password><Value>${var.admin_pass}</Value></Password><Enabled>true</Enabled><Username>${var.admin_user}</Username></AutoLogon>"
+    setting = "AutoLogon"
+    content = "<AutoLogon><Password><Value>${var.admin_pass}</Value></Password><Enabled>true</Enabled><Username>${var.admin_user}</Username></AutoLogon>"
   }
 }
diff --git a/terraform-azure/dynsql.tf b/terraform-azure/dynsql.tf
index 9c85c9e..f9386b9 100644
--- a/terraform-azure/dynsql.tf
+++ b/terraform-azure/dynsql.tf
@@ -27,18 +27,18 @@ resource "azurerm_windows_virtual_machine" "dynsql" {
   size                  = "Standard_B2s"
 
   os_disk {
-    caching       = "ReadWrite"
+    caching              = "ReadWrite"
     storage_account_type = "Standard_LRS"
   }
 
   computer_name  = "dynsql"
-  admin_username = "${var.admin_user}"
-  admin_password = "${var.admin_pass}"
+  admin_username = var.admin_user
+  admin_password = var.admin_pass
 
   source_image_id = "/subscriptions/${var.subscription_id}/resourceGroups/NetworkWatcherRG/providers/Microsoft.Compute/images/dynamics"
 
   additional_unattend_content {
-    setting      = "AutoLogon"
-    content      = "<AutoLogon><Password><Value>${var.admin_pass}</Value></Password><Enabled>true</Enabled><Username>${var.admin_user}</Username></AutoLogon>"
+    setting = "AutoLogon"
+    content = "<AutoLogon><Password><Value>${var.admin_pass}</Value></Password><Enabled>true</Enabled><Username>${var.admin_user}</Username></AutoLogon>"
   }
 }
diff --git a/terraform-azure/provider.tf b/terraform-azure/provider.tf
index 9ea4b73..5ff882a 100644
--- a/terraform-azure/provider.tf
+++ b/terraform-azure/provider.tf
@@ -2,9 +2,9 @@ provider "azurerm" {
   version = "~>2.0"
   features {
   }
-  client_id       = "${var.client_id}"
-  client_secret   = "${var.client_secret}"
-  tenant_id       = "${var.tenant_id}"
-  subscription_id = "${var.subscription_id}"
+  client_id       = var.client_id
+  client_secret   = var.client_secret
+  tenant_id       = var.tenant_id
+  subscription_id = var.subscription_id
 }
 
diff --git a/terraform-azure/variable.tf b/terraform-azure/variable.tf
index dfe4a99..290f295 100644
--- a/terraform-azure/variable.tf
+++ b/terraform-azure/variable.tf
@@ -1,29 +1,29 @@
-variable client_id {
+variable "client_id" {
   type        = string
   description = "Azure Client ID"
 }
 
-variable client_secret {
+variable "client_secret" {
   type        = string
   description = "Azure Client Secret"
 }
 
-variable tenant_id {
+variable "tenant_id" {
   type        = string
   description = "Azure Tenant ID"
 }
 
-variable subscription_id {
+variable "subscription_id" {
   type        = string
   description = "Azure Subscription ID"
 }
 
-variable admin_user {
+variable "admin_user" {
   type        = string
   description = "Admin username"
 }
 
-variable admin_pass {
+variable "admin_pass" {
   type        = string
   description = "Admin password"
 }
diff --git a/terraform/provider.tf b/terraform/provider.tf
index 379ace3..2cb2c34 100644
--- a/terraform/provider.tf
+++ b/terraform/provider.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     virtualbox = {
-      source = "terra-farm/virtualbox"
+      source  = "terra-farm/virtualbox"
       version = "0.2.2-alpha.1"
     }
   }
diff --git a/terraform/variables.tf b/terraform/variables.tf
index 2db795d..1096583 100644
--- a/terraform/variables.tf
+++ b/terraform/variables.tf
@@ -1,9 +1,9 @@
-variable netdev {
+variable "netdev" {
   type        = string
   description = "Default network adapter to use"
 }
 
-variable branch {
+variable "branch" {
   type        = string
   description = "Git branch in use"
 }