diff --git a/04-variables-and-outputs/examples/terraform.tfvars b/04-variables-and-outputs/examples/terraform.tfvars
index 5723e98..d548543 100644
--- a/04-variables-and-outputs/examples/terraform.tfvars
+++ b/04-variables-and-outputs/examples/terraform.tfvars
@@ -1,3 +1,3 @@
 instance_name = "hello-world"
-ami = "ami-011899242bb902164" # Ubuntu 20.04 LTS // us-east-1
+ami           = "ami-011899242bb902164" # Ubuntu 20.04 LTS // us-east-1
 instance_type = "t2.micro"
\ No newline at end of file
diff --git a/04-variables-and-outputs/web-app/terraform.tfvars b/04-variables-and-outputs/web-app/terraform.tfvars
index 5343cf1..a9dc760 100644
--- a/04-variables-and-outputs/web-app/terraform.tfvars
+++ b/04-variables-and-outputs/web-app/terraform.tfvars
@@ -1,5 +1,5 @@
 bucket_name = "devops-directive-web-app-data"
-domain = "mysuperawesomesite.com"
-db_name = "mydb"
-db_user = "foo"
+domain      = "mysuperawesomesite.com"
+db_name     = "mydb"
+db_user     = "foo"
 # db_pass = "foobarbaz"
\ No newline at end of file
diff --git a/06-organization-and-modules/web-app-module/dns.tf b/06-organization-and-modules/web-app-module/dns.tf
index 1cb9f1c..adf5d98 100644
--- a/06-organization-and-modules/web-app-module/dns.tf
+++ b/06-organization-and-modules/web-app-module/dns.tf
@@ -1,16 +1,16 @@
 resource "aws_route53_zone" "primary" {
   count = var.create_dns_zone ? 1 : 0
-  name = var.domain
+  name  = var.domain
 }
 
 data "aws_route53_zone" "primary" {
   count = var.create_dns_zone ? 0 : 1
-  name = var.domain
+  name  = var.domain
 }
 
 locals {
   dns_zone_id = var.create_dns_zone ? aws_route53_zone.primary[0].zone_id : data.aws_route53_zone.primary[0].zone_id
-  subdomain = var.environment_name == "production" ? "" : "${var.environment_name}."
+  subdomain   = var.environment_name == "production" ? "" : "${var.environment_name}."
 }
 
 resource "aws_route53_record" "root" {
diff --git a/06-organization-and-modules/web-app-module/variables.tf b/06-organization-and-modules/web-app-module/variables.tf
index 6f5d761..87c2784 100644
--- a/06-organization-and-modules/web-app-module/variables.tf
+++ b/06-organization-and-modules/web-app-module/variables.tf
@@ -8,14 +8,14 @@ variable "region" {
 
 variable "app_name" {
   description = "Name of the web application"
-  type = string
-  default = "web-app"
+  type        = string
+  default     = "web-app"
 }
 
 variable "environment_name" {
   description = "Deployment environment (dev/staging/production)"
-  type = string
-  default = "dev"
+  type        = string
+  default     = "dev"
 }
 
 # EC2 Variables
@@ -43,8 +43,8 @@ variable "bucket_name" {
 
 variable "create_dns_zone" {
   description = "If true, create new route53 zone, if false read existing route53 zone"
-  type = bool
-  default = false
+  type        = bool
+  default     = false
 }
 
 variable "domain" {
diff --git a/06-organization-and-modules/web-app/main.tf b/06-organization-and-modules/web-app/main.tf
index 83cab2a..80c62d9 100644
--- a/06-organization-and-modules/web-app/main.tf
+++ b/06-organization-and-modules/web-app/main.tf
@@ -31,28 +31,28 @@ module "web_app_1" {
   source = "../web-app-module"
 
   # Input Variables
-  bucket_name = "web-app-1-devops-directive-web-app-data"
-  domain      = "mysuperawesomesite.com"
-  app_name = "web-app-1"
+  bucket_name      = "web-app-1-devops-directive-web-app-data"
+  domain           = "mysuperawesomesite.com"
+  app_name         = "web-app-1"
   environment_name = "production"
-  instance_type = "t2.small"
-  create_dns_zone = true
-  db_name     = "webapp1db"
-  db_user     = "foo"
-  db_pass     = var.db_pass
+  instance_type    = "t2.small"
+  create_dns_zone  = true
+  db_name          = "webapp1db"
+  db_user          = "foo"
+  db_pass          = var.db_pass
 }
 
 module "web_app_2" {
   source = "../web-app-module"
 
   # Input Variables
-  bucket_name = "web-app-2-devops-directive-web-app-data"
-  domain      = "myothersuperawesomesite.com"
-  app_name    = "web-app-2"
+  bucket_name      = "web-app-2-devops-directive-web-app-data"
+  domain           = "myothersuperawesomesite.com"
+  app_name         = "web-app-2"
   environment_name = "production"
-  instance_type = "t2.small"
-  create_dns_zone = true
-  db_name     = "webapp2db"
-  db_user     = "foo"
-  db_pass     = var.db_pass
+  instance_type    = "t2.small"
+  create_dns_zone  = true
+  db_name          = "webapp2db"
+  db_user          = "foo"
+  db_pass          = var.db_pass
 }
diff --git a/07-managing-multiple-environments/file-structure/production/main.tf b/07-managing-multiple-environments/file-structure/production/main.tf
index dec5cfb..5793ada 100644
--- a/07-managing-multiple-environments/file-structure/production/main.tf
+++ b/07-managing-multiple-environments/file-structure/production/main.tf
@@ -35,12 +35,12 @@ module "web_app" {
   source = "../../../06-organization-and-modules/web-app-module"
 
   # Input Variables
-  bucket_name = "devops-directive-web-app-data-${local.environment_name}"
-  domain      = "mysuperawesomesite.com"
+  bucket_name      = "devops-directive-web-app-data-${local.environment_name}"
+  domain           = "mysuperawesomesite.com"
   environment_name = local.environment_name
-  instance_type = "t2.small"
-  create_dns_zone = true
-  db_name     = "${local.environment_name}mydb"
-  db_user     = "foo"
-  db_pass     = var.db_pass
+  instance_type    = "t2.small"
+  create_dns_zone  = true
+  db_name          = "${local.environment_name}mydb"
+  db_user          = "foo"
+  db_pass          = var.db_pass
 }
diff --git a/07-managing-multiple-environments/file-structure/staging/main.tf b/07-managing-multiple-environments/file-structure/staging/main.tf
index fe5cffa..31a0680 100644
--- a/07-managing-multiple-environments/file-structure/staging/main.tf
+++ b/07-managing-multiple-environments/file-structure/staging/main.tf
@@ -35,12 +35,12 @@ module "web_app" {
   source = "../../../06-organization-and-modules/web-app-module"
 
   # Input Variables
-  bucket_name = "devops-directive-web-app-data-${local.environment_name}"
-  domain      = "mysuperawesomesite.com"
+  bucket_name      = "devops-directive-web-app-data-${local.environment_name}"
+  domain           = "mysuperawesomesite.com"
   environment_name = local.environment_name
-  instance_type = "t2.micro"
-  create_dns_zone = false
-  db_name     = "${local.environment_name}mydb" 
-  db_user     = "foo"
-  db_pass     = var.db_pass
+  instance_type    = "t2.micro"
+  create_dns_zone  = false
+  db_name          = "${local.environment_name}mydb"
+  db_user          = "foo"
+  db_pass          = var.db_pass
 }
diff --git a/07-managing-multiple-environments/workspaces/main.tf b/07-managing-multiple-environments/workspaces/main.tf
index e42a365..0788a36 100644
--- a/07-managing-multiple-environments/workspaces/main.tf
+++ b/07-managing-multiple-environments/workspaces/main.tf
@@ -35,12 +35,12 @@ module "web_app" {
   source = "../../05-organization-and-modules/web-app-module"
 
   # Input Variables
-  bucket_name = "devops-directive-web-app-data-${local.environment_name}"
-  domain      = "mysuperawesomesite.com"
+  bucket_name      = "devops-directive-web-app-data-${local.environment_name}"
+  domain           = "mysuperawesomesite.com"
   environment_name = local.environment_name
-  instance_type = "t2.small"
-  create_dns_zone = terraform.workspace == "production" ? true : false
-  db_name     = "${local.environment_name}mydb"
-  db_user     = "foo"
-  db_pass     = var.db_pass
+  instance_type    = "t2.small"
+  create_dns_zone  = terraform.workspace == "production" ? true : false
+  db_name          = "${local.environment_name}mydb"
+  db_user          = "foo"
+  db_pass          = var.db_pass
 }