diff --git a/infra/modules/providers/azure/api-mgmt/main.tf b/infra/modules/providers/azure/api-mgmt/main.tf
index e69de29..8b13789 100644
--- a/infra/modules/providers/azure/api-mgmt/main.tf
+++ b/infra/modules/providers/azure/api-mgmt/main.tf
@@ -0,0 +1 @@
+
diff --git a/infra/modules/providers/azure/api-mgmt/output.tf b/infra/modules/providers/azure/api-mgmt/output.tf
index e69de29..8b13789 100644
--- a/infra/modules/providers/azure/api-mgmt/output.tf
+++ b/infra/modules/providers/azure/api-mgmt/output.tf
@@ -0,0 +1 @@
+
diff --git a/infra/modules/providers/azure/api-mgmt/variables.tf b/infra/modules/providers/azure/api-mgmt/variables.tf
index e69de29..8b13789 100644
--- a/infra/modules/providers/azure/api-mgmt/variables.tf
+++ b/infra/modules/providers/azure/api-mgmt/variables.tf
@@ -0,0 +1 @@
+
diff --git a/infra/modules/providers/azure/app-gateway/main.tf b/infra/modules/providers/azure/app-gateway/main.tf
index b6b5c04..1382701 100644
--- a/infra/modules/providers/azure/app-gateway/main.tf
+++ b/infra/modules/providers/azure/app-gateway/main.tf
@@ -1,15 +1,16 @@
 data "azurerm_resource_group" "appgateway" {
-  name      = "${var.resource_group_name}"
+  name = "${var.resource_group_name}"
 }
 
 data "azurerm_virtual_network" "appgateway" {
-    name                = "${var.virtual_network_name}"
-    resource_group_name = "${data.azurerm_resource_group.appgateway.name}"
+  name                = "${var.virtual_network_name}"
+  resource_group_name = "${data.azurerm_resource_group.appgateway.name}"
 }
+
 data "azurerm_subnet" "appgateway" {
-    name                    = "${var.subnet_name}"
-    resource_group_name     = "${data.azurerm_resource_group.appgateway.name}"
-    virtual_network_name    = "${data.azurerm_virtual_network.appgateway.name}"
+  name                 = "${var.subnet_name}"
+  resource_group_name  = "${data.azurerm_resource_group.appgateway.name}"
+  virtual_network_name = "${data.azurerm_virtual_network.appgateway.name}"
 }
 
 resource "azurerm_application_gateway" "appgateway" {
@@ -35,10 +36,10 @@ resource "azurerm_application_gateway" "appgateway" {
   }
 
   frontend_ip_configuration {
-    name                  = "${var.appgateway_frontend_ip_configuration_name}"
-    subnet_id             = "${var.frontend_ip_config_subnet_id}"
-    private_ip_address    = "${var.frontend_ip_config_private_ip_address}"
-    public_ip_address_id  = "${var.frontend_ip_config_public_ip_address_id}"
+    name                 = "${var.appgateway_frontend_ip_configuration_name}"
+    subnet_id            = "${var.frontend_ip_config_subnet_id}"
+    private_ip_address   = "${var.frontend_ip_config_private_ip_address}"
+    public_ip_address_id = "${var.frontend_ip_config_public_ip_address_id}"
   }
 
   backend_address_pool {
@@ -60,10 +61,10 @@ resource "azurerm_application_gateway" "appgateway" {
   }
 
   request_routing_rule {
-    name                        = "${var.appgateway_request_routing_rule_name}"
-    rule_type                   = "${var.request_routing_rule_type}"
-    http_listener_name          = "${var.appgateway_listener_name}"
-    backend_address_pool_name   = "${var.appgateway_backend_address_pool_name}"
-    backend_http_settings_name  = "${var.appgateway_backend_http_setting_name}"
+    name                       = "${var.appgateway_request_routing_rule_name}"
+    rule_type                  = "${var.request_routing_rule_type}"
+    http_listener_name         = "${var.appgateway_listener_name}"
+    backend_address_pool_name  = "${var.appgateway_backend_address_pool_name}"
+    backend_http_settings_name = "${var.appgateway_backend_http_setting_name}"
   }
 }
diff --git a/infra/modules/providers/azure/app-gateway/output.tf b/infra/modules/providers/azure/app-gateway/output.tf
index 74b6fc1..717ca37 100644
--- a/infra/modules/providers/azure/app-gateway/output.tf
+++ b/infra/modules/providers/azure/app-gateway/output.tf
@@ -5,10 +5,10 @@ output "appgateway_name" {
 
 output "appgateway_ipconfig" {
   description = "The Application Gateway IP Configuration"
-  value = "${azurerm_application_gateway.appgateway.gateway_ip_configuration}"
+  value       = "${azurerm_application_gateway.appgateway.gateway_ip_configuration}"
 }
 
 output "appgateway_frontend_ip_configuration" {
   description = "The Application Gateway Frontend IP Configuration"
-  value = "${azurerm_application_gateway.appgateway.frontend_ip_configuration}"
+  value       = "${azurerm_application_gateway.appgateway.frontend_ip_configuration}"
 }
diff --git a/infra/modules/providers/azure/app-service/main.tf b/infra/modules/providers/azure/app-service/main.tf
index bd7ae5e..ed2c743 100644
--- a/infra/modules/providers/azure/app-service/main.tf
+++ b/infra/modules/providers/azure/app-service/main.tf
@@ -1,10 +1,10 @@
 data "azurerm_resource_group" "appsvc" {
-  name      = "${var.service_plan_resource_group_name}"
+  name = "${var.service_plan_resource_group_name}"
 }
 
 data "azurerm_app_service_plan" "appsvc" {
-  name                    = "${var.service_plan_name}"
-  resource_group_name     = "${data.azurerm_resource_group.appsvc.name}"
+  name                = "${var.service_plan_name}"
+  resource_group_name = "${data.azurerm_resource_group.appsvc.name}"
 }
 
 resource "azurerm_app_service" "appsvc" {
@@ -14,7 +14,7 @@ resource "azurerm_app_service" "appsvc" {
   app_service_plan_id = "${data.azurerm_app_service_plan.appsvc.id}"
   tags                = "${var.resource_tags}"
   count               = "${length(keys(var.app_service_name))}"
-  
+
   app_settings {
     DOCKER_REGISTRY_SERVER_URL      = "${var.docker_registry_server_url}"
     DOCKER_REGISTRY_SERVER_USERNAME = "${var.docker_registry_server_username}"
@@ -22,8 +22,8 @@ resource "azurerm_app_service" "appsvc" {
   }
 
   site_config {
-    linux_fx_version      = "${element(values(var.app_service_name), count.index)}"
-    always_on             = "${var.site_config_always_on}"
-    virtual_network_name  = "${var.site_config_vnet_name}"
+    linux_fx_version     = "${element(values(var.app_service_name), count.index)}"
+    always_on            = "${var.site_config_always_on}"
+    virtual_network_name = "${var.site_config_vnet_name}"
   }
 }
diff --git a/infra/modules/providers/azure/app-service/output.tf b/infra/modules/providers/azure/app-service/output.tf
index 489ace7..3bdc83b 100644
--- a/infra/modules/providers/azure/app-service/output.tf
+++ b/infra/modules/providers/azure/app-service/output.tf
@@ -2,4 +2,3 @@ output "app_service_uri" {
   description = "The URL of the app service created"
   value       = "${azurerm_app_service.appsvc.*.default_site_hostname}"
 }
-
diff --git a/infra/modules/providers/azure/app-service/variables.tf b/infra/modules/providers/azure/app-service/variables.tf
index 26a9c45..c2713b8 100644
--- a/infra/modules/providers/azure/app-service/variables.tf
+++ b/infra/modules/providers/azure/app-service/variables.tf
@@ -9,9 +9,9 @@ variable "service_plan_name" {
 }
 
 variable "resource_tags" {
-description = "Map of tags to apply to taggable resources in this module. By default the taggable resources are tagged with the name defined above and this map is merged in"
-type        = "map"
-default     = {}
+  description = "Map of tags to apply to taggable resources in this module. By default the taggable resources are tagged with the name defined above and this map is merged in"
+  type        = "map"
+  default     = {}
 }
 
 variable "app_service_name" {
diff --git a/infra/modules/providers/azure/provider/main.tf b/infra/modules/providers/azure/provider/main.tf
index 97f26c9..5de8056 100644
--- a/infra/modules/providers/azure/provider/main.tf
+++ b/infra/modules/providers/azure/provider/main.tf
@@ -1,5 +1,5 @@
 provider "azurerm" {
-    version = "~>1.23.0"
+  version = "~>1.23.0"
 }
 
 terraform {
@@ -7,9 +7,9 @@ terraform {
 }
 
 provider "null" {
-    version = "~>2.0.0"
+  version = "~>2.0.0"
 }
 
 provider "azuread" {
   version = "~>0.1"
-}
\ No newline at end of file
+}
diff --git a/infra/modules/providers/azure/service-plan/main.tf b/infra/modules/providers/azure/service-plan/main.tf
index bae2032..d2db529 100644
--- a/infra/modules/providers/azure/service-plan/main.tf
+++ b/infra/modules/providers/azure/service-plan/main.tf
@@ -13,8 +13,8 @@ resource "azurerm_app_service_plan" "svcplan" {
   reserved            = "${var.service_plan_kind == "Linux" ? true : "${var.service_plan_reserved}"}"
 
   sku {
-    tier      = "${var.service_plan_tier}"
-    size      = "${var.service_plan_size}"
-    capacity  = "${var.service_plan_capacity}"
+    tier     = "${var.service_plan_tier}"
+    size     = "${var.service_plan_size}"
+    capacity = "${var.service_plan_capacity}"
   }
 }
diff --git a/infra/modules/providers/azure/service-plan/output.tf b/infra/modules/providers/azure/service-plan/output.tf
index b2cdd4f..ae0d5f1 100644
--- a/infra/modules/providers/azure/service-plan/output.tf
+++ b/infra/modules/providers/azure/service-plan/output.tf
@@ -1,6 +1,6 @@
 output "resource_group_name" {
   description = "The name of the resource group created"
-  value = "${azurerm_resource_group.svcplan.name}"
+  value       = "${azurerm_resource_group.svcplan.name}"
 }
 
 output "service_plan_name" {
@@ -10,5 +10,5 @@ output "service_plan_name" {
 
 output "service_plan_kind" {
   description = "The kind of service plan created"
-  value = "${azurerm_app_service_plan.svcplan.kind}"
+  value       = "${azurerm_app_service_plan.svcplan.kind}"
 }
diff --git a/infra/modules/providers/azure/service-plan/variables.tf b/infra/modules/providers/azure/service-plan/variables.tf
index 68ae680..ca083c5 100644
--- a/infra/modules/providers/azure/service-plan/variables.tf
+++ b/infra/modules/providers/azure/service-plan/variables.tf
@@ -5,7 +5,7 @@ variable "resource_group_name" {
 
 variable "resource_group_location" {
   description = "Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. The full list of Azure regions can be found at https://azure.microsoft.com/regions"
-  type        = "string"  
+  type        = "string"
 }
 
 variable "resource_tags" {
@@ -38,13 +38,13 @@ variable "service_plan_kind" {
 }
 
 variable "service_plan_capacity" {
-    description = "The capacity of Service Plan to be created."
-    type        = "string"
-    default     = "1"
+  description = "The capacity of Service Plan to be created."
+  type        = "string"
+  default     = "1"
 }
 
 variable "service_plan_reserved" {
-    description = "Is the Service Plan to be created reserved. Possible values are true/false"
-    type        = "string"
-    default     = "true"
+  description = "Is the Service Plan to be created reserved. Possible values are true/false"
+  type        = "string"
+  default     = "true"
 }
diff --git a/infra/modules/providers/azure/tm-endpoint-ip/main.tf b/infra/modules/providers/azure/tm-endpoint-ip/main.tf
index e69de29..8b13789 100644
--- a/infra/modules/providers/azure/tm-endpoint-ip/main.tf
+++ b/infra/modules/providers/azure/tm-endpoint-ip/main.tf
@@ -0,0 +1 @@
+
diff --git a/infra/modules/providers/azure/tm-endpoint-ip/output.tf b/infra/modules/providers/azure/tm-endpoint-ip/output.tf
index e69de29..8b13789 100644
--- a/infra/modules/providers/azure/tm-endpoint-ip/output.tf
+++ b/infra/modules/providers/azure/tm-endpoint-ip/output.tf
@@ -0,0 +1 @@
+
diff --git a/infra/modules/providers/azure/tm-endpoint-ip/variables.tf b/infra/modules/providers/azure/tm-endpoint-ip/variables.tf
index e69de29..8b13789 100644
--- a/infra/modules/providers/azure/tm-endpoint-ip/variables.tf
+++ b/infra/modules/providers/azure/tm-endpoint-ip/variables.tf
@@ -0,0 +1 @@
+
diff --git a/infra/modules/providers/azure/tm-profile/main.tf b/infra/modules/providers/azure/tm-profile/main.tf
index e69de29..8b13789 100644
--- a/infra/modules/providers/azure/tm-profile/main.tf
+++ b/infra/modules/providers/azure/tm-profile/main.tf
@@ -0,0 +1 @@
+
diff --git a/infra/modules/providers/azure/tm-profile/output.tf b/infra/modules/providers/azure/tm-profile/output.tf
index e69de29..8b13789 100644
--- a/infra/modules/providers/azure/tm-profile/output.tf
+++ b/infra/modules/providers/azure/tm-profile/output.tf
@@ -0,0 +1 @@
+
diff --git a/infra/modules/providers/azure/tm-profile/variables.tf b/infra/modules/providers/azure/tm-profile/variables.tf
index e69de29..8b13789 100644
--- a/infra/modules/providers/azure/tm-profile/variables.tf
+++ b/infra/modules/providers/azure/tm-profile/variables.tf
@@ -0,0 +1 @@
+
diff --git a/infra/modules/providers/azure/vnet/main.tf b/infra/modules/providers/azure/vnet/main.tf
index e69de29..8b13789 100644
--- a/infra/modules/providers/azure/vnet/main.tf
+++ b/infra/modules/providers/azure/vnet/main.tf
@@ -0,0 +1 @@
+
diff --git a/infra/modules/providers/azure/vnet/output.tf b/infra/modules/providers/azure/vnet/output.tf
index e69de29..8b13789 100644
--- a/infra/modules/providers/azure/vnet/output.tf
+++ b/infra/modules/providers/azure/vnet/output.tf
@@ -0,0 +1 @@
+
diff --git a/infra/modules/providers/azure/vnet/variables.tf b/infra/modules/providers/azure/vnet/variables.tf
index e69de29..8b13789 100644
--- a/infra/modules/providers/azure/vnet/variables.tf
+++ b/infra/modules/providers/azure/vnet/variables.tf
@@ -0,0 +1 @@
+
diff --git a/infra/templates/azure-simple-hw/backend.tf b/infra/templates/azure-simple-hw/backend.tf
index c2fe2c2..3384210 100644
--- a/infra/templates/azure-simple-hw/backend.tf
+++ b/infra/templates/azure-simple-hw/backend.tf
@@ -1,5 +1,5 @@
 terraform {
   backend "azurerm" {
-    key                  = "terraform.tfstate"
+    key = "terraform.tfstate"
   }
-}
\ No newline at end of file
+}
diff --git a/infra/templates/azure-simple-hw/outputs.tf b/infra/templates/azure-simple-hw/outputs.tf
index ba32001..0167f41 100644
--- a/infra/templates/azure-simple-hw/outputs.tf
+++ b/infra/templates/azure-simple-hw/outputs.tf
@@ -4,4 +4,4 @@ output "app_service_name" {
 
 output "app_service_default_hostname" {
   value = "https://${azurerm_app_service.main.default_site_hostname}"
-}
\ No newline at end of file
+}
diff --git a/infra/templates/azure-simple-hw/provider.tf b/infra/templates/azure-simple-hw/provider.tf
index 2f6e56e..88b790a 100644
--- a/infra/templates/azure-simple-hw/provider.tf
+++ b/infra/templates/azure-simple-hw/provider.tf
@@ -1,11 +1,11 @@
 provider "azurerm" {
-    version = "~>1.21.0"
+  version = "~>1.21.0"
 }
 
 provider "null" {
-    version = "~>2.0.0"
+  version = "~>2.0.0"
 }
 
 terraform {
   required_version = "~> 0.11.13"
-}
\ No newline at end of file
+}
diff --git a/infra/templates/azure-simple-hw/variables.tf b/infra/templates/azure-simple-hw/variables.tf
index 85029e6..371585f 100644
--- a/infra/templates/azure-simple-hw/variables.tf
+++ b/infra/templates/azure-simple-hw/variables.tf
@@ -14,4 +14,4 @@ variable "storage_account_replication_type" {
 variable "app_service_linux_container_command" {
   description = "Defines the exec command for linux based container app services."
   default     = "DOCKER|appsvcsample/static-site:latest"
-}
\ No newline at end of file
+}
diff --git a/infra/templates/backend-state-setup/main.tf b/infra/templates/backend-state-setup/main.tf
index 0b25e41..eb46b61 100644
--- a/infra/templates/backend-state-setup/main.tf
+++ b/infra/templates/backend-state-setup/main.tf
@@ -3,7 +3,7 @@ module "provider" {
 }
 
 module "backend-state-setup" {
-    source = "github.com/Microsoft/bedrock/cluster/azure/backend-state"
-    name = "${var.name}"
-    location = "${var.location}"
-}
\ No newline at end of file
+  source   = "github.com/Microsoft/bedrock/cluster/azure/backend-state"
+  name     = "${var.name}"
+  location = "${var.location}"
+}
diff --git a/infra/templates/backend-state-setup/variables.tf b/infra/templates/backend-state-setup/variables.tf
index 361d585..dde6a00 100644
--- a/infra/templates/backend-state-setup/variables.tf
+++ b/infra/templates/backend-state-setup/variables.tf
@@ -13,4 +13,4 @@ variable "resource_tags" {
   description = "Map of tags to apply to taggable resources in this module.  By default the taggable resources are tagged with the name defined above and this map is merged in"
   type        = "map"
   default     = {}
-}
\ No newline at end of file
+}