diff --git a/monitoring/sns-email-topic/variables.tf b/monitoring/sns-email-topic/variables.tf
index 2955bda..a221cc0 100755
--- a/monitoring/sns-email-topic/variables.tf
+++ b/monitoring/sns-email-topic/variables.tf
@@ -1,5 +1,5 @@
 variable "sns_emails" {
-  type = list
+  type    = list
   default = []
 }
 variable "tags" {
diff --git a/organizations/aws-master/main.tf b/organizations/aws-master/main.tf
index 54eb04f..c4c03cd 100755
--- a/organizations/aws-master/main.tf
+++ b/organizations/aws-master/main.tf
@@ -17,7 +17,7 @@ resource "aws_organizations_organizational_unit" "non_prod" {
 }
 
 resource "aws_organizations_policy" "prod" {
-  name  = "Production"
+  name = "Production"
 
   content = <<CONTENT
 {
@@ -32,7 +32,7 @@ CONTENT
 }
 
 resource "aws_organizations_policy" "non_prod" {
-  name  = "NonProduction"
+  name = "NonProduction"
 
   content = <<CONTENT
 {
diff --git a/security/cloudtrail/iam.tf b/security/cloudtrail/iam.tf
index 46f8379..2b4d38b 100644
--- a/security/cloudtrail/iam.tf
+++ b/security/cloudtrail/iam.tf
@@ -1,6 +1,6 @@
 resource "aws_iam_role" "cloudtrail_log_group_role" {
-  name  = aws_s3_bucket.cloudtrail_bucket.id
-  tags  = var.tags
+  name = aws_s3_bucket.cloudtrail_bucket.id
+  tags = var.tags
 
   assume_role_policy = <<EOF
 {
@@ -19,8 +19,8 @@ EOF
 }
 
 resource "aws_iam_role_policy" "cloudtrail_log_group_role_policy" {
-  name  = aws_s3_bucket.cloudtrail_bucket.id
-  role  = aws_iam_role.cloudtrail_log_group_role.id
+  name = aws_s3_bucket.cloudtrail_bucket.id
+  role = aws_iam_role.cloudtrail_log_group_role.id
 
   policy = <<EOF
 {
diff --git a/security/cloudtrail/main.tf b/security/cloudtrail/main.tf
index 8d10125..f2ff2bc 100755
--- a/security/cloudtrail/main.tf
+++ b/security/cloudtrail/main.tf
@@ -17,7 +17,7 @@ resource "aws_cloudtrail" "cloudtrail_bucket_logging" {
     include_management_events = var.include_management_events
 
     data_resource {
-      type   = "AWS::S3::Object"
+      type = "AWS::S3::Object"
       values = compact(concat(
         [var.default_log_bucket],
         formatlist("arn:aws:s3:::%s/", var.activity_log_buckets)
diff --git a/security/cloudtrail/variables.tf b/security/cloudtrail/variables.tf
index 4b2dfde..c3968e8 100755
--- a/security/cloudtrail/variables.tf
+++ b/security/cloudtrail/variables.tf
@@ -60,6 +60,6 @@ variable "activity_log_buckets" {
   default     = []
 }
 variable "default_log_bucket" {
-  default = "arn:aws:s3:::"
+  default     = "arn:aws:s3:::"
   description = "The default buckets to log - all buckets in the account - override to empty string"
 }
diff --git a/security/kms-key/main.tf b/security/kms-key/main.tf
index 35d5681..11d8ecb 100644
--- a/security/kms-key/main.tf
+++ b/security/kms-key/main.tf
@@ -49,7 +49,7 @@ data "aws_iam_policy_document" "kms" {
     ]
     resources = ["*"]
     principals {
-      type = "AWS"
+      type        = "AWS"
       identifiers = formatlist("arn:aws:iam::${local.account_id}:role/%s", var.usage_roles)
     }
   }
@@ -62,7 +62,7 @@ data "aws_iam_policy_document" "kms" {
     ]
     resources = ["*"]
     principals {
-      type = "AWS"
+      type        = "AWS"
       identifiers = formatlist("arn:aws:iam::${local.account_id}:role/%s", var.usage_roles)
     }
     condition {
diff --git a/security/kms-key/variables.tf b/security/kms-key/variables.tf
index 857e5d7..b123531 100644
--- a/security/kms-key/variables.tf
+++ b/security/kms-key/variables.tf
@@ -8,7 +8,7 @@ variable "app_name" {
 }
 variable "administrator_roles" {
   description = "IAM Role name of AWS account administrators"
-  type = list
+  type        = list
 }
 variable "tags" {
   default     = {}