diff --git a/apps/api_gateway_resource/main.tf b/apps/api_gateway_resource/main.tf
index c568ad90..b21d3b6a 100644
--- a/apps/api_gateway_resource/main.tf
+++ b/apps/api_gateway_resource/main.tf
@@ -1,9 +1 @@
-provider "aws" {
-}
-
-module "aws_core_data" {
-  source = "../../data_providers/aws_account_core_data"
-  providers = {
-   aws = "aws"
-  } 
-}
+provider "aws" {}
diff --git a/apps/cloudwatch_lambda/main.tf b/apps/cloudwatch_lambda/main.tf
index 2b18d536..b21d3b6a 100644
--- a/apps/cloudwatch_lambda/main.tf
+++ b/apps/cloudwatch_lambda/main.tf
@@ -1,10 +1 @@
-provider "aws" {
-}
-
-module "aws_core_data" {	
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"	
-  source = "../../data_providers/aws_account_core_data"	
-  providers = {	
-   aws = "aws"	
-  } 	
-}
+provider "aws" {}
diff --git a/apps/cloudwatch_lambda_schedule/main.tf b/apps/cloudwatch_lambda_schedule/main.tf
index 7c6fd567..05821dd8 100644
--- a/apps/cloudwatch_lambda_schedule/main.tf
+++ b/apps/cloudwatch_lambda_schedule/main.tf
@@ -1,11 +1,2 @@
-providers = {
-   aws = "aws"
-  } 
+provider "aws" {}
 
-module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
-  providers = {
-   aws = "aws"
-  } 
-}
diff --git a/apps/cluster/main.tf b/apps/cluster/main.tf
index fa7977c0..0ba4da65 100644
--- a/apps/cluster/main.tf
+++ b/apps/cluster/main.tf
@@ -1,16 +1,9 @@
-provider "aws" {
-}
+provider "aws" {}
 
 module "aws_core_data" {
-//  source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
+  source       = "../../data_providers/shared-vpc-data"
+  account_type = "${var.account_type}"
   providers = {
-   aws = "aws"
-  } 
+    aws = "aws"
+  }
 }
-
-// For local development use instead:
-//module "aws_core_data" {
-//  source = "../../data_providers/aws_account_core_data"
-//}
-
diff --git a/apps/cluster/variables.tf b/apps/cluster/variables.tf
index 8b1a1cef..45386935 100644
--- a/apps/cluster/variables.tf
+++ b/apps/cluster/variables.tf
@@ -1,9 +1,7 @@
 variable "region" {
   default = "eu-west-1"
 }
-variable "account_type" {
-  default = "sandbox"
-}
+variable "account_type" {}
 variable "tags_business_unit" {
   default = "Albumprinter"
 }
@@ -33,7 +31,7 @@ variable "private" {
 
 variable "response_template" {
   type = "map"
-  default ={
+  default = {
     "application/json" = ""
   }
 }
@@ -42,7 +40,7 @@ variable "instance_count" {
   default = 1
 }
 variable "iam_policy_document" {
-  default =<<EOF
+  default = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -96,11 +94,11 @@ variable "chef_serverurl" {
 
 variable "SG_cidr_blocks" {
   type = "list"
-  default =  [""]
-  }
+  default = [""]
+}
 variable "SG_elb_cidr_blocks" {
   type = "list"
-  default =  [""]
+  default = [""]
 }
 
 variable "lb_port_outside" {
@@ -147,14 +145,14 @@ variable "elb_sg_ingress_protocol" {
   default = "-1"
 }
 
-variable "elb_healthcheck_target"  {
+variable "elb_healthcheck_target" {
   default = "TCP:22"
 }
 
-variable "chef_attributes_json"  {
+variable "chef_attributes_json" {
   default = <<-EOF
   {
     "key": "value"
   }
   EOF
-}
\ No newline at end of file
+}
diff --git a/apps/ec2/main.tf b/apps/ec2/main.tf
index d4e463b7..0ba4da65 100644
--- a/apps/ec2/main.tf
+++ b/apps/ec2/main.tf
@@ -1,17 +1,9 @@
-provider "aws" {
-}
-
+provider "aws" {}
 
 module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
+  source       = "../../data_providers/shared-vpc-data"
+  account_type = "${var.account_type}"
   providers = {
-   aws = "aws"
+    aws = "aws"
   }
 }
-
-// For local development use instead:
-//module "aws_core_data" {
-//  source = "../../data_providers/aws_account_core_data"
-//}
-
diff --git a/apps/ec2/variables.tf b/apps/ec2/variables.tf
index 61d50388..f478da9d 100644
--- a/apps/ec2/variables.tf
+++ b/apps/ec2/variables.tf
@@ -1,9 +1,7 @@
 variable "region" {
   default = "eu-west-1"
 }
-variable "account_type" {
-  default = "sandbox"
-}
+variable "account_type" {}
 variable "tags_business_unit" {
   default = "Albumprinter"
 }
@@ -32,7 +30,7 @@ variable "private" {
 
 variable "response_template" {
   type = "map"
-  default ={
+  default = {
     "application/json" = ""
   }
 }
@@ -41,7 +39,7 @@ variable "instance_count" {
   default = 1
 }
 variable "iam_policy_document" {
-  default =<<EOF
+  default = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -83,4 +81,4 @@ variable "tags_AutoOn" {
 
 variable "tags_AutoOff" {
   default = ""
-}
\ No newline at end of file
+}
diff --git a/apps/ec2_standalone/main.tf b/apps/ec2_standalone/main.tf
index 7b466c07..75e371a3 100644
--- a/apps/ec2_standalone/main.tf
+++ b/apps/ec2_standalone/main.tf
@@ -1,12 +1,11 @@
-provider "aws" {
-}
+provider "aws" {}
 
-module "aws_account_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
+module "aws_core_data" {
+  source       = "../../data_providers/shared-vpc-data"
+  account_type = "${var.account_type}"
   providers = {
-   aws = "aws"
-  } 
+    aws = "aws"
+  }
 }
 
 resource "aws_key_pair" "ec2_key_pair" {
diff --git a/apps/elasticache_redis/README.md b/apps/elasticache_redis/README.md
index b834e452..a8d11956 100644
--- a/apps/elasticache_redis/README.md
+++ b/apps/elasticache_redis/README.md
@@ -1,4 +1,5 @@
 # Description
+
 An example terraform module to build simple application as aws lambda function triggered by cloudwatch event scheduleder.
 
 ## Code Example
@@ -26,4 +27,4 @@ module "cache" {
   project     = "Unknown"
   environment = "Unknown"
 }
-```
\ No newline at end of file
+```
diff --git a/apps/elasticache_redis/main.tf b/apps/elasticache_redis/main.tf
index a4b0d96e..0ba4da65 100644
--- a/apps/elasticache_redis/main.tf
+++ b/apps/elasticache_redis/main.tf
@@ -1,10 +1,9 @@
-provider "aws" {
-}
+provider "aws" {}
 
 module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
+  source       = "../../data_providers/shared-vpc-data"
+  account_type = "${var.account_type}"
   providers = {
-   aws = "aws"
-  } 
+    aws = "aws"
+  }
 }
diff --git a/apps/elasticache_redis/redis.tf b/apps/elasticache_redis/redis.tf
index fac2950b..4d0068d3 100644
--- a/apps/elasticache_redis/redis.tf
+++ b/apps/elasticache_redis/redis.tf
@@ -2,23 +2,10 @@
 # Security group resources
 #
 resource "aws_security_group" "redis" {
-  vpc_id = "${module.aws_core_data.vpc_id}"
+  vpc_id      = "${module.aws_core_data.vpc_id}"
   description = "Allow all inbound traffic for the scheduled lambda function"
-  ingress {
-    from_port = 6379
-    to_port = 6379
-    protocol = "tcp"
-    cidr_blocks = ["192.168.0.0/16"]
-  }
-
-  egress {
-    from_port = 0
-    to_port = 0
-    protocol = "-1"
-    cidr_blocks = ["0.0.0.0/0"]
-  }
 
-  tags {
+  tags = {
     Domain          = "${var.tags_domain}"
     Name            = "${var.app_name}"
     "Business Unit" = "${var.tags_business_unit}"
@@ -30,8 +17,29 @@ resource "aws_security_group" "redis" {
   }
 }
 
+resource "aws_security_group_rule" "redis_ingress" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.redis.id}"
+  description       = "Allow access to Redis"
+  from_port         = 6379
+  to_port           = 6379
+  protocol          = "tcp"
+  cidr_blocks       = ["${var.redis_cidr}"]
+}
+resource "aws_security_group_rule" "redis_egress" {
+  security_group_id = "${aws_security_group.redis.id}"
+  description       = "Allow all outgoing"
+  type              = "egress"
+  from_port         = 0
+  to_port           = 0
+  protocol          = "-1"
+  cidr_blocks       = ["0.0.0.0/0"]
+}
+
+
+
 resource "aws_elasticache_subnet_group" "redis" {
-  name = "${var.app_name}"
+  name       = "${var.app_name}"
   subnet_ids = ["${split(",", join(",", module.aws_core_data.private_subnets))}"]
 }
 
@@ -52,7 +60,7 @@ resource "aws_elasticache_replication_group" "redis" {
   notification_topic_arn        = "${var.notification_topic_arn}"
   port                          = 6379
 
-  tags {
+  tags = {
     Domain          = "${var.tags_domain}"
     Name            = "${var.app_name}"
     "Business Unit" = "${var.tags_business_unit}"
diff --git a/apps/elasticache_redis/variables.tf b/apps/elasticache_redis/variables.tf
index 1e86c1ba..0f634cca 100644
--- a/apps/elasticache_redis/variables.tf
+++ b/apps/elasticache_redis/variables.tf
@@ -7,6 +7,10 @@ variable "account_type" {
 variable "tags_business_unit" {
   default = "Albumprinter"
 }
+variable "redis_cidr" {
+  description = "cidr range that has access to Redis. By default all the shared VPC ranges"
+  default     = "10.96.0.0/12"
+}
 variable "tags_cost_center" {}
 variable "tags_team" {}
 variable "tags_domain" {}
@@ -30,8 +34,8 @@ variable "costcenter" {
 variable "cache_identifier" {}
 
 variable "parameter_group" {
-  description= "For cluster mode override with: default.redis3.2.cluster.on"
-  default = "default.redis3.2"
+  description = "For cluster mode override with: default.redis3.2.cluster.on"
+  default     = "default.redis3.2"
 }
 
 variable "maintenance_window" {}
@@ -65,4 +69,4 @@ variable "alarm_memory_threshold" {
 
 variable "alarm_actions" {
   type = "list"
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function/cloudwatch.tf b/apps/lambda_function/cloudwatch.tf
index bd9ab518..b039135c 100644
--- a/apps/lambda_function/cloudwatch.tf
+++ b/apps/lambda_function/cloudwatch.tf
@@ -1,19 +1,18 @@
 module "lambda_app_cloudwatch" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//apps/cloudwatch_lambda"
-  source = "../../apps/cloudwatch_lambda"
-  app_name = "${var.app_name}"
-  log_group_name = "/aws/lambda/${var.app_name}"
-  alarm_threshold = "${var.lambda_memory_alert_threshold}"
-  alarm_action_arn = "${var.alarm_action_arn}"
-  environment = "${var.environment}"
-  tags_team = "${var.tags_team}"
-  tags_domain = "${var.tags_domain}"
-  tags_purpose = "${var.tags_purpose}"
-  tags_cost_center = "${var.tags_cost_center}"
-  description = "${var.description}"
-  retention_days = "${var.retention_days}"
-  enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"    
+  source                   = "../../apps/cloudwatch_lambda"
+  app_name                 = "${var.app_name}"
+  log_group_name           = "/aws/lambda/${var.app_name}"
+  alarm_threshold          = "${var.lambda_memory_alert_threshold}"
+  alarm_action_arn         = "${var.alarm_action_arn}"
+  environment              = "${var.environment}"
+  tags_team                = "${var.tags_team}"
+  tags_domain              = "${var.tags_domain}"
+  tags_purpose             = "${var.tags_purpose}"
+  tags_cost_center         = "${var.tags_cost_center}"
+  description              = "${var.description}"
+  retention_days           = "${var.retention_days}"
+  enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
-   aws = "aws"
+    aws = "aws"
   }
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function/main.tf b/apps/lambda_function/main.tf
index 16a6a3eb..cbf61a70 100644
--- a/apps/lambda_function/main.tf
+++ b/apps/lambda_function/main.tf
@@ -1,10 +1 @@
-provider "aws" {
-}
-
-module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
-  providers = {
-   aws = "aws"
-  }
-}
\ No newline at end of file
+provider "aws" {}
diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough/api_gateway_resource.tf b/apps/lambda_function_api_gateway_all_methods_passthrough/api_gateway_resource.tf
index 7aba5497..9fe5dbcc 100644
--- a/apps/lambda_function_api_gateway_all_methods_passthrough/api_gateway_resource.tf
+++ b/apps/lambda_function_api_gateway_all_methods_passthrough/api_gateway_resource.tf
@@ -1,17 +1,16 @@
 module "api_gateway_resource" {
-  //source                                  = "git@github.com:albumprinter/eops_tf_modules.git//apps/api_gateway_resource"
-  source                                  = "../../apps/api_gateway_resource"
-  enable                                  = "${var.swagger_resource_enable}"
-  api_key_required                        = "${var.swagger_api_key_required}"
-  api_key                                 = "${var.swagger_api_key}"
-  resource_path                           = "${var.swagger_resource_path}"
-  api_gateway_rest_api_id                 = "${aws_api_gateway_rest_api.app.id}"
-  api_gateway_rest_api_name               = "${aws_api_gateway_rest_api.app.name}"
-  api_gateway_rest_api_root_resource_id   = "${aws_api_gateway_rest_api.app.root_resource_id}"
-  api_gateway_deployment_stage_name       = "${aws_api_gateway_deployment.app.stage_name}"
-  api_gateway_integration_uri             = "${aws_api_gateway_integration.app_integration.uri}"
-  api_gateway_integration_credentials     = "${aws_api_gateway_integration.app_integration.credentials}"
+  source                                = "../../apps/api_gateway_resource"
+  enable                                = "${var.swagger_resource_enable}"
+  api_key_required                      = "${var.swagger_api_key_required}"
+  api_key                               = "${var.swagger_api_key}"
+  resource_path                         = "${var.swagger_resource_path}"
+  api_gateway_rest_api_id               = "${aws_api_gateway_rest_api.app.id}"
+  api_gateway_rest_api_name             = "${aws_api_gateway_rest_api.app.name}"
+  api_gateway_rest_api_root_resource_id = "${aws_api_gateway_rest_api.app.root_resource_id}"
+  api_gateway_deployment_stage_name     = "${aws_api_gateway_deployment.app.stage_name}"
+  api_gateway_integration_uri           = "${aws_api_gateway_integration.app_integration.uri}"
+  api_gateway_integration_credentials   = "${aws_api_gateway_integration.app_integration.credentials}"
   providers = {
-   aws = "aws"
-  } 
-}
\ No newline at end of file
+    aws = "aws"
+  }
+}
diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough/cloudwatch.tf b/apps/lambda_function_api_gateway_all_methods_passthrough/cloudwatch.tf
index 73450d6c..b039135c 100644
--- a/apps/lambda_function_api_gateway_all_methods_passthrough/cloudwatch.tf
+++ b/apps/lambda_function_api_gateway_all_methods_passthrough/cloudwatch.tf
@@ -1,19 +1,18 @@
 module "lambda_app_cloudwatch" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//apps/cloudwatch_lambda"
-  source = "../../apps/cloudwatch_lambda"
-  app_name = "${var.app_name}"
-  log_group_name = "/aws/lambda/${var.app_name}"
-  alarm_threshold = "${var.lambda_memory_alert_threshold}"
-  alarm_action_arn = "${var.alarm_action_arn}"
-  environment = "${var.environment}"
-  tags_team = "${var.tags_team}"
-  tags_domain = "${var.tags_domain}"
-  tags_purpose = "${var.tags_purpose}"
-  tags_cost_center = "${var.tags_cost_center}"
-  description = "${var.description}"
-  retention_days = "${var.retention_days}"  
+  source                   = "../../apps/cloudwatch_lambda"
+  app_name                 = "${var.app_name}"
+  log_group_name           = "/aws/lambda/${var.app_name}"
+  alarm_threshold          = "${var.lambda_memory_alert_threshold}"
+  alarm_action_arn         = "${var.alarm_action_arn}"
+  environment              = "${var.environment}"
+  tags_team                = "${var.tags_team}"
+  tags_domain              = "${var.tags_domain}"
+  tags_purpose             = "${var.tags_purpose}"
+  tags_cost_center         = "${var.tags_cost_center}"
+  description              = "${var.description}"
+  retention_days           = "${var.retention_days}"
   enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
-   aws = "aws"
+    aws = "aws"
   }
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough/main.tf b/apps/lambda_function_api_gateway_all_methods_passthrough/main.tf
index 16a6a3eb..0641b839 100644
--- a/apps/lambda_function_api_gateway_all_methods_passthrough/main.tf
+++ b/apps/lambda_function_api_gateway_all_methods_passthrough/main.tf
@@ -1,10 +1,9 @@
-provider "aws" {
-}
+provider "aws" {}
 
 module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
+  source       = "../../data_providers/shared-vpc-data"
+  account_type = "${var.account_type}"
   providers = {
-   aws = "aws"
+    aws = "aws"
   }
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough/variables.tf b/apps/lambda_function_api_gateway_all_methods_passthrough/variables.tf
index b9df6ad3..afb7a169 100644
--- a/apps/lambda_function_api_gateway_all_methods_passthrough/variables.tf
+++ b/apps/lambda_function_api_gateway_all_methods_passthrough/variables.tf
@@ -1,9 +1,7 @@
 variable "region" {
   default = "eu-west-1"
 }
-variable "account_type" {
-  default = "sandbox"
-}
+variable "account_type" {}
 variable "tags_business_unit" {
   default = "Albumprinter"
 }
@@ -51,7 +49,7 @@ variable "private" {
 
 variable "response_template" {
   type = "map"
-  default ={
+  default = {
     "application/json" = ""
   }
 }
@@ -60,7 +58,7 @@ variable "lambda_memory_alert_threshold" {}
 variable "alarm_action_arn" {}
 
 variable "iam_policy_document" {
-  default =<<EOF
+  default = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -151,4 +149,4 @@ variable "api_gateway_type" {
 }
 variable "enable_cloudwatch_alarms" {
   default = "1"
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/api_gateway_resource.tf b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/api_gateway_resource.tf
index 7aba5497..9fe5dbcc 100644
--- a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/api_gateway_resource.tf
+++ b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/api_gateway_resource.tf
@@ -1,17 +1,16 @@
 module "api_gateway_resource" {
-  //source                                  = "git@github.com:albumprinter/eops_tf_modules.git//apps/api_gateway_resource"
-  source                                  = "../../apps/api_gateway_resource"
-  enable                                  = "${var.swagger_resource_enable}"
-  api_key_required                        = "${var.swagger_api_key_required}"
-  api_key                                 = "${var.swagger_api_key}"
-  resource_path                           = "${var.swagger_resource_path}"
-  api_gateway_rest_api_id                 = "${aws_api_gateway_rest_api.app.id}"
-  api_gateway_rest_api_name               = "${aws_api_gateway_rest_api.app.name}"
-  api_gateway_rest_api_root_resource_id   = "${aws_api_gateway_rest_api.app.root_resource_id}"
-  api_gateway_deployment_stage_name       = "${aws_api_gateway_deployment.app.stage_name}"
-  api_gateway_integration_uri             = "${aws_api_gateway_integration.app_integration.uri}"
-  api_gateway_integration_credentials     = "${aws_api_gateway_integration.app_integration.credentials}"
+  source                                = "../../apps/api_gateway_resource"
+  enable                                = "${var.swagger_resource_enable}"
+  api_key_required                      = "${var.swagger_api_key_required}"
+  api_key                               = "${var.swagger_api_key}"
+  resource_path                         = "${var.swagger_resource_path}"
+  api_gateway_rest_api_id               = "${aws_api_gateway_rest_api.app.id}"
+  api_gateway_rest_api_name             = "${aws_api_gateway_rest_api.app.name}"
+  api_gateway_rest_api_root_resource_id = "${aws_api_gateway_rest_api.app.root_resource_id}"
+  api_gateway_deployment_stage_name     = "${aws_api_gateway_deployment.app.stage_name}"
+  api_gateway_integration_uri           = "${aws_api_gateway_integration.app_integration.uri}"
+  api_gateway_integration_credentials   = "${aws_api_gateway_integration.app_integration.credentials}"
   providers = {
-   aws = "aws"
-  } 
-}
\ No newline at end of file
+    aws = "aws"
+  }
+}
diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/cloudwatch.tf b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/cloudwatch.tf
index a07183cb..9d068fd7 100644
--- a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/cloudwatch.tf
+++ b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/cloudwatch.tf
@@ -1,19 +1,18 @@
 module "lambda_app_cloudwatch" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//apps/cloudwatch_lambda"
-  source = "../../apps/cloudwatch_lambda"
-  app_name = "${var.app_name}"
-  log_group_name = "/aws/lambda/${var.app_name}"
-  alarm_threshold = "${var.lambda_memory_alert_threshold}"
-  alarm_action_arn = "${var.alarm_action_arn}"
-  environment = "${var.environment}"
-  tags_team = "${var.tags_team}"
-  tags_purpose = "${var.tags_purpose}"
-  tags_domain = "${var.tags_domain}"
-  tags_cost_center = "${var.tags_cost_center}"
-  description = "${var.description}"
-  retention_days = "${var.retention_days}"  
+  source                   = "../../apps/cloudwatch_lambda"
+  app_name                 = "${var.app_name}"
+  log_group_name           = "/aws/lambda/${var.app_name}"
+  alarm_threshold          = "${var.lambda_memory_alert_threshold}"
+  alarm_action_arn         = "${var.alarm_action_arn}"
+  environment              = "${var.environment}"
+  tags_team                = "${var.tags_team}"
+  tags_purpose             = "${var.tags_purpose}"
+  tags_domain              = "${var.tags_domain}"
+  tags_cost_center         = "${var.tags_cost_center}"
+  description              = "${var.description}"
+  retention_days           = "${var.retention_days}"
   enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
-   aws = "aws"
-  } 
-}
\ No newline at end of file
+    aws = "aws"
+  }
+}
diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/main.tf b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/main.tf
index 93901fcd..0641b839 100644
--- a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/main.tf
+++ b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/main.tf
@@ -1,10 +1,9 @@
-provider "aws" {
-}
+provider "aws" {}
 
 module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
+  source       = "../../data_providers/shared-vpc-data"
+  account_type = "${var.account_type}"
   providers = {
-   aws = "aws"
-  } 
+    aws = "aws"
+  }
 }
diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/variables.tf b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/variables.tf
index 189d6433..60c914ba 100644
--- a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/variables.tf
+++ b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/variables.tf
@@ -1,9 +1,7 @@
 variable "region" {
   default = "eu-west-1"
 }
-variable "account_type" {
-  default = "sandbox"
-}
+variable "account_type" {}
 variable "tags_business_unit" {
   default = "Albumprinter"
 }
@@ -44,16 +42,16 @@ variable "enabled" {
 
 variable "response_template" {
   type = "map"
-  default ={
+  default = {
     "application/json" = ""
   }
 }
 
-variable "lambda_memory_alert_threshold" {} 
-variable "alarm_action_arn" {} 
+variable "lambda_memory_alert_threshold" {}
+variable "alarm_action_arn" {}
 
 variable "iam_policy_document" {
-  default =<<EOF
+  default = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -115,8 +113,8 @@ variable "iam_policy_document" {
 EOF
 }
 
-variable "retention_days" { 
-  default = "30" 
+variable "retention_days" {
+  default = "30"
 }
 
 variable "binary_media_types" {
@@ -144,4 +142,4 @@ variable "api_gateway_type" {
 }
 variable "enable_cloudwatch_alarms" {
   default = "1"
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/api_gateway_resource.tf b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/api_gateway_resource.tf
index bf27408a..dcb3b32d 100644
--- a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/api_gateway_resource.tf
+++ b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/api_gateway_resource.tf
@@ -1,17 +1,16 @@
 module "api_gateway_resource" {
-  //source                                  = "git@github.com:albumprinter/eops_tf_modules.git//apps/api_gateway_resource"
-  source                                  = "../../apps/api_gateway_resource"
-  enable                                  = "${var.swagger_resource_enable}"
-  api_key_required                        = "${var.swagger_api_key_required}"
-  api_key                                 = "${var.swagger_api_key}"
-  resource_path                           = "${var.swagger_resource_path}"
-  api_gateway_rest_api_id                 = "${aws_api_gateway_rest_api.app.id}"
-  api_gateway_rest_api_name               = "${aws_api_gateway_rest_api.app.name}"
-  api_gateway_rest_api_root_resource_id   = "${aws_api_gateway_rest_api.app.root_resource_id}"
-  api_gateway_deployment_stage_name       = "${aws_api_gateway_deployment.app.stage_name}"
-  api_gateway_integration_uri             = "${aws_api_gateway_integration.app_integration.uri}"
-  api_gateway_integration_credentials     = "${aws_api_gateway_integation.app_integration.credentials}"
+  source                                = "../../apps/api_gateway_resource"
+  enable                                = "${var.swagger_resource_enable}"
+  api_key_required                      = "${var.swagger_api_key_required}"
+  api_key                               = "${var.swagger_api_key}"
+  resource_path                         = "${var.swagger_resource_path}"
+  api_gateway_rest_api_id               = "${aws_api_gateway_rest_api.app.id}"
+  api_gateway_rest_api_name             = "${aws_api_gateway_rest_api.app.name}"
+  api_gateway_rest_api_root_resource_id = "${aws_api_gateway_rest_api.app.root_resource_id}"
+  api_gateway_deployment_stage_name     = "${aws_api_gateway_deployment.app.stage_name}"
+  api_gateway_integration_uri           = "${aws_api_gateway_integration.app_integration.uri}"
+  api_gateway_integration_credentials   = "${aws_api_gateway_integation.app_integration.credentials}"
   providers = {
-   aws = "aws"
-  } 
-}
\ No newline at end of file
+    aws = "aws"
+  }
+}
diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/main.tf b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/main.tf
index a4b0d96e..0ba4da65 100644
--- a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/main.tf
+++ b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/main.tf
@@ -1,10 +1,9 @@
-provider "aws" {
-}
+provider "aws" {}
 
 module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
+  source       = "../../data_providers/shared-vpc-data"
+  account_type = "${var.account_type}"
   providers = {
-   aws = "aws"
-  } 
+    aws = "aws"
+  }
 }
diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/variables.tf b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/variables.tf
index 0ff24881..c021904b 100644
--- a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/variables.tf
+++ b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/variables.tf
@@ -1,9 +1,7 @@
 variable "region" {
   default = "eu-west-1"
 }
-variable "account_type" {
-  default = "sandbox"
-}
+variable "account_type" {}
 variable "tags_business_unit" {
   default = "Albumprinter"
 }
@@ -47,16 +45,16 @@ variable "private" {
 
 variable "response_template" {
   type = "map"
-  default ={
+  default = {
     "application/json" = ""
   }
 }
 
-variable "lambda_memory_alert_threshold" {} 
-variable "alarm_action_arn" {} 
+variable "lambda_memory_alert_threshold" {}
+variable "alarm_action_arn" {}
 
 variable "iam_policy_document" {
-  default =<<EOF
+  default = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -118,9 +116,9 @@ variable "iam_policy_document" {
 EOF
 }
 
-variable "retention_days" { 
-  default = "30" 
-} 
+variable "retention_days" {
+  default = "30"
+}
 
 variable "binary_media_types" {
   default = ["application/octet-stream", "image/*"]
@@ -147,4 +145,4 @@ variable "api_gateway_type" {
 }
 variable "enable_cloudwatch_alarms" {
   default = 1
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/api_gateway_resource.tf b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/api_gateway_resource.tf
index 7aba5497..9fe5dbcc 100644
--- a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/api_gateway_resource.tf
+++ b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/api_gateway_resource.tf
@@ -1,17 +1,16 @@
 module "api_gateway_resource" {
-  //source                                  = "git@github.com:albumprinter/eops_tf_modules.git//apps/api_gateway_resource"
-  source                                  = "../../apps/api_gateway_resource"
-  enable                                  = "${var.swagger_resource_enable}"
-  api_key_required                        = "${var.swagger_api_key_required}"
-  api_key                                 = "${var.swagger_api_key}"
-  resource_path                           = "${var.swagger_resource_path}"
-  api_gateway_rest_api_id                 = "${aws_api_gateway_rest_api.app.id}"
-  api_gateway_rest_api_name               = "${aws_api_gateway_rest_api.app.name}"
-  api_gateway_rest_api_root_resource_id   = "${aws_api_gateway_rest_api.app.root_resource_id}"
-  api_gateway_deployment_stage_name       = "${aws_api_gateway_deployment.app.stage_name}"
-  api_gateway_integration_uri             = "${aws_api_gateway_integration.app_integration.uri}"
-  api_gateway_integration_credentials     = "${aws_api_gateway_integration.app_integration.credentials}"
+  source                                = "../../apps/api_gateway_resource"
+  enable                                = "${var.swagger_resource_enable}"
+  api_key_required                      = "${var.swagger_api_key_required}"
+  api_key                               = "${var.swagger_api_key}"
+  resource_path                         = "${var.swagger_resource_path}"
+  api_gateway_rest_api_id               = "${aws_api_gateway_rest_api.app.id}"
+  api_gateway_rest_api_name             = "${aws_api_gateway_rest_api.app.name}"
+  api_gateway_rest_api_root_resource_id = "${aws_api_gateway_rest_api.app.root_resource_id}"
+  api_gateway_deployment_stage_name     = "${aws_api_gateway_deployment.app.stage_name}"
+  api_gateway_integration_uri           = "${aws_api_gateway_integration.app_integration.uri}"
+  api_gateway_integration_credentials   = "${aws_api_gateway_integration.app_integration.credentials}"
   providers = {
-   aws = "aws"
-  } 
-}
\ No newline at end of file
+    aws = "aws"
+  }
+}
diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/cloudwatch.tf b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/cloudwatch.tf
index a07183cb..9d068fd7 100644
--- a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/cloudwatch.tf
+++ b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/cloudwatch.tf
@@ -1,19 +1,18 @@
 module "lambda_app_cloudwatch" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//apps/cloudwatch_lambda"
-  source = "../../apps/cloudwatch_lambda"
-  app_name = "${var.app_name}"
-  log_group_name = "/aws/lambda/${var.app_name}"
-  alarm_threshold = "${var.lambda_memory_alert_threshold}"
-  alarm_action_arn = "${var.alarm_action_arn}"
-  environment = "${var.environment}"
-  tags_team = "${var.tags_team}"
-  tags_purpose = "${var.tags_purpose}"
-  tags_domain = "${var.tags_domain}"
-  tags_cost_center = "${var.tags_cost_center}"
-  description = "${var.description}"
-  retention_days = "${var.retention_days}"  
+  source                   = "../../apps/cloudwatch_lambda"
+  app_name                 = "${var.app_name}"
+  log_group_name           = "/aws/lambda/${var.app_name}"
+  alarm_threshold          = "${var.lambda_memory_alert_threshold}"
+  alarm_action_arn         = "${var.alarm_action_arn}"
+  environment              = "${var.environment}"
+  tags_team                = "${var.tags_team}"
+  tags_purpose             = "${var.tags_purpose}"
+  tags_domain              = "${var.tags_domain}"
+  tags_cost_center         = "${var.tags_cost_center}"
+  description              = "${var.description}"
+  retention_days           = "${var.retention_days}"
   enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
-   aws = "aws"
-  } 
-}
\ No newline at end of file
+    aws = "aws"
+  }
+}
diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/main.tf b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/main.tf
index a4b0d96e..0ba4da65 100644
--- a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/main.tf
+++ b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/main.tf
@@ -1,10 +1,9 @@
-provider "aws" {
-}
+provider "aws" {}
 
 module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
+  source       = "../../data_providers/shared-vpc-data"
+  account_type = "${var.account_type}"
   providers = {
-   aws = "aws"
-  } 
+    aws = "aws"
+  }
 }
diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/variables.tf b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/variables.tf
index 4182aca7..f95c7c44 100644
--- a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/variables.tf
+++ b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/variables.tf
@@ -1,9 +1,7 @@
 variable "region" {
   default = "eu-west-1"
 }
-variable "account_type" {
-  default = "sandbox"
-}
+variable "account_type" {}
 variable "tags_business_unit" {
   default = "Albumprinter"
 }
@@ -59,7 +57,7 @@ variable "private" {
 
 variable "response_template" {
   type = "map"
-  default ={
+  default = {
     "application/json" = ""
   }
 }
@@ -67,7 +65,7 @@ variable "lambda_memory_alert_threshold" {}
 variable "alarm_action_arn" {}
 
 variable "iam_policy_document" {
-  default =<<EOF
+  default = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -158,4 +156,4 @@ variable "api_gateway_type" {
 }
 variable "enable_cloudwatch_alarms" {
   default = "1"
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_event_pattern/main.tf b/apps/lambda_function_event_pattern/main.tf
index 97a835b2..b21d3b6a 100644
--- a/apps/lambda_function_event_pattern/main.tf
+++ b/apps/lambda_function_event_pattern/main.tf
@@ -1,8 +1 @@
-provider "aws" {
-}
-
-//module "aws_core_data" {
-//  source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-//  // For local development use instead:
-//  //  source = "../../data_providers/aws_account_core_data"
-//}
+provider "aws" {}
diff --git a/apps/lambda_function_scheduled/main.tf b/apps/lambda_function_scheduled/main.tf
index a4b0d96e..b21d3b6a 100644
--- a/apps/lambda_function_scheduled/main.tf
+++ b/apps/lambda_function_scheduled/main.tf
@@ -1,10 +1 @@
-provider "aws" {
-}
-
-module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
-  providers = {
-   aws = "aws"
-  } 
-}
+provider "aws" {}
diff --git a/apps/lambda_function_scheduled_vpc/cloudwatch.tf b/apps/lambda_function_scheduled_vpc/cloudwatch.tf
index bb52372a..e5fb3b03 100644
--- a/apps/lambda_function_scheduled_vpc/cloudwatch.tf
+++ b/apps/lambda_function_scheduled_vpc/cloudwatch.tf
@@ -2,7 +2,7 @@ resource "aws_cloudwatch_event_rule" "app" {
   name                = "${var.app_name}"
   schedule_expression = "${var.schedule_expression}"
   count               = "${var.enabled}"
-  tags = "${local.tags}"
+  tags                = "${local.tags}"
 }
 
 resource "aws_cloudwatch_event_target" "lambda_vpc" {
@@ -13,20 +13,20 @@ resource "aws_cloudwatch_event_target" "lambda_vpc" {
 }
 
 module "lambda_app_cloudwatch" {
-  source = "../../apps/cloudwatch_lambda"
-  app_name = "${var.app_name}"
-  log_group_name = "/aws/lambda/${var.app_name}"
-  alarm_threshold = "${var.lambda_memory_alert_threshold}"
-  alarm_action_arn = "${var.alarm_action_arn}"
-  environment = "${var.environment}"
-  tags_team = "${var.tags_team}"
-  tags_domain = "${var.tags_domain}"
-  tags_cost_center = "${var.tags_cost_center}"
-  tags_purpose = "${var.tags_purpose}"
-  description = "${var.description}"  
-  retention_days = "${var.retention_days}"  
+  source                   = "../../apps/cloudwatch_lambda"
+  app_name                 = "${var.app_name}"
+  log_group_name           = "/aws/lambda/${var.app_name}"
+  alarm_threshold          = "${var.lambda_memory_alert_threshold}"
+  alarm_action_arn         = "${var.alarm_action_arn}"
+  environment              = "${var.environment}"
+  tags_team                = "${var.tags_team}"
+  tags_domain              = "${var.tags_domain}"
+  tags_cost_center         = "${var.tags_cost_center}"
+  tags_purpose             = "${var.tags_purpose}"
+  description              = "${var.description}"
+  retention_days           = "${var.retention_days}"
   enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
-   aws = "aws"
+    aws = "aws"
   }
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_scheduled_vpc/lambda.tf b/apps/lambda_function_scheduled_vpc/lambda.tf
index eda64e63..e357f3b0 100644
--- a/apps/lambda_function_scheduled_vpc/lambda.tf
+++ b/apps/lambda_function_scheduled_vpc/lambda.tf
@@ -12,21 +12,21 @@ resource "aws_lambda_function" "app" {
   s3_bucket = "${var.lambda_bucket_name}"
   s3_key = "${module.lambda_s3_bucket_object.key}"
   function_name = "${var.app_name}"
-  description = "${var.description}"
-  role = "${aws_iam_role.iam_for_app.arn}"
-  handler = "${var.handler}"
-  runtime = "${var.runtime}"
-  memory_size = "${var.memory_size}"
-  timeout = "${var.timeout}"
+  description   = "${var.description}"
+  role          = "${aws_iam_role.iam_for_app.arn}"
+  handler       = "${var.handler}"
+  runtime       = "${var.runtime}"
+  memory_size   = "${var.memory_size}"
+  timeout       = "${var.timeout}"
   environment {
     variables = "${var.variables}"
   }
   vpc_config = {
-    subnet_ids = ["${split( ",", var.private == 1 ?   join(",", module.aws_core_data.private_subnets) :  join(",", concat(module.aws_core_data.private_subnets,module.aws_core_data.public_subnets)))}"]
+    subnet_ids         = ["${split(",", var.private == 1 ? join(",", module.aws_core_data.private_subnets) : join(",", concat(module.aws_core_data.private_subnets, module.aws_core_data.public_subnets)))}"]
     security_group_ids = ["${aws_security_group.sg_for_app.id}"]
   }
-  count            = "${var.enabled}"
-  tags = "${local.tags}"
+  count = "${var.enabled}"
+  tags  = "${local.tags}"
 }
 
 resource "aws_lambda_permission" "cloudwatch" {
@@ -39,7 +39,7 @@ resource "aws_lambda_permission" "cloudwatch" {
 }
 
 resource "aws_iam_role" "iam_for_app" {
-  name = "${var.app_name}"
+  name               = "${var.app_name}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -94,4 +94,4 @@ resource "aws_security_group" "sg_for_app" {
   }
 
   tags = "${local.tags}"
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_scheduled_vpc/main.tf b/apps/lambda_function_scheduled_vpc/main.tf
index a4b0d96e..0ba4da65 100644
--- a/apps/lambda_function_scheduled_vpc/main.tf
+++ b/apps/lambda_function_scheduled_vpc/main.tf
@@ -1,10 +1,9 @@
-provider "aws" {
-}
+provider "aws" {}
 
 module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
+  source       = "../../data_providers/shared-vpc-data"
+  account_type = "${var.account_type}"
   providers = {
-   aws = "aws"
-  } 
+    aws = "aws"
+  }
 }
diff --git a/apps/lambda_function_scheduled_vpc/variables.tf b/apps/lambda_function_scheduled_vpc/variables.tf
index 002d2fe7..35d8f846 100644
--- a/apps/lambda_function_scheduled_vpc/variables.tf
+++ b/apps/lambda_function_scheduled_vpc/variables.tf
@@ -4,6 +4,7 @@ variable "region" {
 variable "tags_business_unit" {
   default = "Albumprinter"
 }
+variable "account_type" {}
 variable "tags_cost_center" {}
 variable "tags_team" {}
 variable "tags_domain" {}
@@ -44,7 +45,7 @@ variable "private" {
 
 
 variable "iam_policy_document" {
-  default =<<EOF
+  default = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -115,4 +116,4 @@ variable "retention_days" {
 }
 variable "enable_cloudwatch_alarms" {
   default = "1"
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_sns/cloudwatch.tf b/apps/lambda_function_sns/cloudwatch.tf
index 3f32a91c..b039135c 100644
--- a/apps/lambda_function_sns/cloudwatch.tf
+++ b/apps/lambda_function_sns/cloudwatch.tf
@@ -1,19 +1,18 @@
 module "lambda_app_cloudwatch" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//apps/cloudwatch_lambda"
-  source = "../../apps/cloudwatch_lambda"
-  app_name = "${var.app_name}"
-  log_group_name = "/aws/lambda/${var.app_name}"
-  alarm_threshold = "${var.lambda_memory_alert_threshold}"
-  alarm_action_arn = "${var.alarm_action_arn}"
-  environment = "${var.environment}"
-  tags_team = "${var.tags_team}"
-  tags_domain = "${var.tags_domain}"
-  tags_purpose = "${var.tags_purpose}"
-  tags_cost_center = "${var.tags_cost_center}"
-  description = "${var.description}"
-  retention_days = "${var.retention_days}" 
+  source                   = "../../apps/cloudwatch_lambda"
+  app_name                 = "${var.app_name}"
+  log_group_name           = "/aws/lambda/${var.app_name}"
+  alarm_threshold          = "${var.lambda_memory_alert_threshold}"
+  alarm_action_arn         = "${var.alarm_action_arn}"
+  environment              = "${var.environment}"
+  tags_team                = "${var.tags_team}"
+  tags_domain              = "${var.tags_domain}"
+  tags_purpose             = "${var.tags_purpose}"
+  tags_cost_center         = "${var.tags_cost_center}"
+  description              = "${var.description}"
+  retention_days           = "${var.retention_days}"
   enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
-   aws = "aws"
+    aws = "aws"
   }
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_sns/lambda.tf b/apps/lambda_function_sns/lambda.tf
index 8311c7f4..11dbb82e 100644
--- a/apps/lambda_function_sns/lambda.tf
+++ b/apps/lambda_function_sns/lambda.tf
@@ -12,29 +12,29 @@ resource "aws_lambda_function" "app" {
   s3_bucket = "${var.lambda_bucket_name}"
   s3_key = "${module.lambda_s3_bucket_object.key}"
   function_name = "${var.app_name}"
-  description = "${var.description}"
-  role = "${aws_iam_role.iam_for_app.arn}"
-  handler = "${var.handler}"
-  runtime = "${var.runtime}"
-  memory_size = "${var.memory_size}"
-  timeout = "${var.timeout}"
+  description   = "${var.description}"
+  role          = "${aws_iam_role.iam_for_app.arn}"
+  handler       = "${var.handler}"
+  runtime       = "${var.runtime}"
+  memory_size   = "${var.memory_size}"
+  timeout       = "${var.timeout}"
   vpc_config = {
-    subnet_ids = ["${split( ",", var.private == 1 ?   join(",", module.aws_core_data.private_subnets) :  join(",", concat(module.aws_core_data.private_subnets,module.aws_core_data.public_subnets)))}"]
+    subnet_ids         = ["${split(",", var.private == 1 ? join(",", module.aws_core_data.private_subnets) : join(",", concat(module.aws_core_data.private_subnets, module.aws_core_data.public_subnets)))}"]
     security_group_ids = ["${aws_security_group.sg_for_app.id}"]
   }
   environment {
     variables = "${var.variables}"
   }
-  count            = "${var.enabled}"
+  count = "${var.enabled}"
   dead_letter_config = {
     target_arn = "${aws_sns_topic.lambda_error_sns.arn}"
   }
-  tags = "${local.tags}"
+  tags                           = "${local.tags}"
   reserved_concurrent_executions = "${var.reserved_concurrent_executions}"
 }
 
 resource "aws_iam_role" "iam_for_app" {
-  name = "${var.app_name}"
+  name               = "${var.app_name}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -96,4 +96,4 @@ resource "aws_security_group" "sg_for_app" {
     cidr_blocks = ["0.0.0.0/0"]
   }
   tags = "${local.tags}"
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_sns/locals.tf b/apps/lambda_function_sns/locals.tf
index b83771c0..cf4b2aa4 100644
--- a/apps/lambda_function_sns/locals.tf
+++ b/apps/lambda_function_sns/locals.tf
@@ -9,4 +9,4 @@ locals {
     Description     = "${var.description}"
     Environment     = "${var.environment}"
   }
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_sns/main.tf b/apps/lambda_function_sns/main.tf
index 916861e9..0ba4da65 100644
--- a/apps/lambda_function_sns/main.tf
+++ b/apps/lambda_function_sns/main.tf
@@ -1,10 +1,9 @@
-provider "aws" {
-}
+provider "aws" {}
 
 module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
+  source       = "../../data_providers/shared-vpc-data"
+  account_type = "${var.account_type}"
   providers = {
-   aws = "aws"
-  } 
-}
\ No newline at end of file
+    aws = "aws"
+  }
+}
diff --git a/apps/lambda_function_sns/sns.tf b/apps/lambda_function_sns/sns.tf
index a944be9f..5dc3d2e3 100644
--- a/apps/lambda_function_sns/sns.tf
+++ b/apps/lambda_function_sns/sns.tf
@@ -9,26 +9,26 @@ resource "aws_sns_topic_subscription" "lambda_replay_topic_subscription" {
 }
 
 resource "aws_lambda_permission" "allow_sns_replay" {
-  statement_id   = "AllowExecutionFromSNSReplay"
-  action         = "lambda:InvokeFunction"
-  function_name  = "${aws_lambda_function.app.function_name}"
-  principal      = "sns.amazonaws.com"  
-  source_arn     = "${aws_sns_topic.lambda_replay_sns.arn}"  
+  statement_id  = "AllowExecutionFromSNSReplay"
+  action        = "lambda:InvokeFunction"
+  function_name = "${aws_lambda_function.app.function_name}"
+  principal     = "sns.amazonaws.com"
+  source_arn    = "${aws_sns_topic.lambda_replay_sns.arn}"
 }
 
 resource "aws_sns_topic_subscription" "lambda_event_topic_subscription" {
-  topic_arn = "${var.lambda_sns_subscription_arn}"
-  protocol  = "lambda"
-  endpoint  = "${aws_lambda_function.app.arn}"
+  topic_arn     = "${var.lambda_sns_subscription_arn}"
+  protocol      = "lambda"
+  endpoint      = "${aws_lambda_function.app.arn}"
   filter_policy = "${var.sns_subscription_filters}"
 }
 
 resource "aws_lambda_permission" "allow_sns_event" {
-  statement_id   = "AllowExecutionFromSNSEvent"
-  action         = "lambda:InvokeFunction"
-  function_name  = "${aws_lambda_function.app.function_name}"
-  principal      = "sns.amazonaws.com"  
-  source_arn     = "${var.lambda_sns_subscription_arn}"
+  statement_id  = "AllowExecutionFromSNSEvent"
+  action        = "lambda:InvokeFunction"
+  function_name = "${aws_lambda_function.app.function_name}"
+  principal     = "sns.amazonaws.com"
+  source_arn    = "${var.lambda_sns_subscription_arn}"
 }
 
 resource "aws_sns_topic" "lambda_error_sns" {
diff --git a/apps/lambda_function_sns/sqs.tf b/apps/lambda_function_sns/sqs.tf
index 0d1cb8f6..0e00d266 100644
--- a/apps/lambda_function_sns/sqs.tf
+++ b/apps/lambda_function_sns/sqs.tf
@@ -1,7 +1,7 @@
 resource "aws_sqs_queue" "lambda_error_queue" {
   name                      = "${var.app_name}-ERROR"
   message_retention_seconds = 1209600
-  tags = "${local.tags}"
+  tags                      = "${local.tags}"
 }
 
 
@@ -28,4 +28,4 @@ resource "aws_sqs_queue_policy" "lambda_error_queue_policy" {
   ]
 }
 POLICY
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_sns/variables.tf b/apps/lambda_function_sns/variables.tf
index 0a2c76dd..0154c05b 100644
--- a/apps/lambda_function_sns/variables.tf
+++ b/apps/lambda_function_sns/variables.tf
@@ -1,9 +1,7 @@
 variable "region" {
   default = "eu-west-1"
 }
-variable "account_type" {
-  default = "sandbox"
-}
+variable "account_type" {}
 variable "tags_business_unit" {
   default = "Albumprinter"
 }
@@ -122,4 +120,4 @@ variable "sns_subscription_filters" {
 }
 variable "enable_cloudwatch_alarms" {
   default = "1"
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_sns_no_vpc/cloudwatch.tf b/apps/lambda_function_sns_no_vpc/cloudwatch.tf
index 5f31ea5d..b039135c 100644
--- a/apps/lambda_function_sns_no_vpc/cloudwatch.tf
+++ b/apps/lambda_function_sns_no_vpc/cloudwatch.tf
@@ -1,19 +1,18 @@
 module "lambda_app_cloudwatch" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//apps/cloudwatch_lambda"
-  source = "../../apps/cloudwatch_lambda"
-  app_name = "${var.app_name}"
-  log_group_name = "/aws/lambda/${var.app_name}"
-  alarm_threshold = "${var.lambda_memory_alert_threshold}"
-  alarm_action_arn = "${var.alarm_action_arn}"
-  environment = "${var.environment}"
-  tags_team = "${var.tags_team}"
-  tags_domain = "${var.tags_domain}"
-  tags_purpose = "${var.tags_purpose}"
-  tags_cost_center = "${var.tags_cost_center}"
-  description = "${var.description}"
-  retention_days = "${var.retention_days}"  
+  source                   = "../../apps/cloudwatch_lambda"
+  app_name                 = "${var.app_name}"
+  log_group_name           = "/aws/lambda/${var.app_name}"
+  alarm_threshold          = "${var.lambda_memory_alert_threshold}"
+  alarm_action_arn         = "${var.alarm_action_arn}"
+  environment              = "${var.environment}"
+  tags_team                = "${var.tags_team}"
+  tags_domain              = "${var.tags_domain}"
+  tags_purpose             = "${var.tags_purpose}"
+  tags_cost_center         = "${var.tags_cost_center}"
+  description              = "${var.description}"
+  retention_days           = "${var.retention_days}"
   enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
-   aws = "aws"
-  } 
-}
\ No newline at end of file
+    aws = "aws"
+  }
+}
diff --git a/apps/lambda_function_sns_no_vpc/lambda.tf b/apps/lambda_function_sns_no_vpc/lambda.tf
index a01cdb52..eb86e055 100644
--- a/apps/lambda_function_sns_no_vpc/lambda.tf
+++ b/apps/lambda_function_sns_no_vpc/lambda.tf
@@ -12,25 +12,25 @@ resource "aws_lambda_function" "app" {
   s3_bucket = "${var.lambda_bucket_name}"
   s3_key = "${module.lambda_s3_bucket_object.key}"
   function_name = "${var.app_name}"
-  description = "${var.description}"
-  role = "${aws_iam_role.iam_for_app.arn}"
-  handler = "${var.handler}"
-  runtime = "${var.runtime}"
-  memory_size = "${var.memory_size}"
-  timeout = "${var.timeout}"
+  description   = "${var.description}"
+  role          = "${aws_iam_role.iam_for_app.arn}"
+  handler       = "${var.handler}"
+  runtime       = "${var.runtime}"
+  memory_size   = "${var.memory_size}"
+  timeout       = "${var.timeout}"
   environment {
     variables = "${var.variables}"
   }
-  count            = "${var.enabled}"
+  count = "${var.enabled}"
   dead_letter_config = {
     target_arn = "${aws_sns_topic.lambda_error_sns.arn}"
   }
-  tags = "${local.tags}"
+  tags                           = "${local.tags}"
   reserved_concurrent_executions = "${var.reserved_concurrent_executions}"
 }
 
 resource "aws_iam_role" "iam_for_app" {
-  name = "${var.app_name}"
+  name               = "${var.app_name}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -92,4 +92,4 @@ resource "aws_security_group" "sg_for_app" {
     cidr_blocks = ["0.0.0.0/0"]
   }
   tags = "${local.tags}"
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_sns_no_vpc/locals.tf b/apps/lambda_function_sns_no_vpc/locals.tf
index b83771c0..cf4b2aa4 100644
--- a/apps/lambda_function_sns_no_vpc/locals.tf
+++ b/apps/lambda_function_sns_no_vpc/locals.tf
@@ -9,4 +9,4 @@ locals {
     Description     = "${var.description}"
     Environment     = "${var.environment}"
   }
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_sns_no_vpc/main.tf b/apps/lambda_function_sns_no_vpc/main.tf
index a4b0d96e..0ba4da65 100644
--- a/apps/lambda_function_sns_no_vpc/main.tf
+++ b/apps/lambda_function_sns_no_vpc/main.tf
@@ -1,10 +1,9 @@
-provider "aws" {
-}
+provider "aws" {}
 
 module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
+  source       = "../../data_providers/shared-vpc-data"
+  account_type = "${var.account_type}"
   providers = {
-   aws = "aws"
-  } 
+    aws = "aws"
+  }
 }
diff --git a/apps/lambda_function_sns_no_vpc/sns.tf b/apps/lambda_function_sns_no_vpc/sns.tf
index a944be9f..5dc3d2e3 100644
--- a/apps/lambda_function_sns_no_vpc/sns.tf
+++ b/apps/lambda_function_sns_no_vpc/sns.tf
@@ -9,26 +9,26 @@ resource "aws_sns_topic_subscription" "lambda_replay_topic_subscription" {
 }
 
 resource "aws_lambda_permission" "allow_sns_replay" {
-  statement_id   = "AllowExecutionFromSNSReplay"
-  action         = "lambda:InvokeFunction"
-  function_name  = "${aws_lambda_function.app.function_name}"
-  principal      = "sns.amazonaws.com"  
-  source_arn     = "${aws_sns_topic.lambda_replay_sns.arn}"  
+  statement_id  = "AllowExecutionFromSNSReplay"
+  action        = "lambda:InvokeFunction"
+  function_name = "${aws_lambda_function.app.function_name}"
+  principal     = "sns.amazonaws.com"
+  source_arn    = "${aws_sns_topic.lambda_replay_sns.arn}"
 }
 
 resource "aws_sns_topic_subscription" "lambda_event_topic_subscription" {
-  topic_arn = "${var.lambda_sns_subscription_arn}"
-  protocol  = "lambda"
-  endpoint  = "${aws_lambda_function.app.arn}"
+  topic_arn     = "${var.lambda_sns_subscription_arn}"
+  protocol      = "lambda"
+  endpoint      = "${aws_lambda_function.app.arn}"
   filter_policy = "${var.sns_subscription_filters}"
 }
 
 resource "aws_lambda_permission" "allow_sns_event" {
-  statement_id   = "AllowExecutionFromSNSEvent"
-  action         = "lambda:InvokeFunction"
-  function_name  = "${aws_lambda_function.app.function_name}"
-  principal      = "sns.amazonaws.com"  
-  source_arn     = "${var.lambda_sns_subscription_arn}"
+  statement_id  = "AllowExecutionFromSNSEvent"
+  action        = "lambda:InvokeFunction"
+  function_name = "${aws_lambda_function.app.function_name}"
+  principal     = "sns.amazonaws.com"
+  source_arn    = "${var.lambda_sns_subscription_arn}"
 }
 
 resource "aws_sns_topic" "lambda_error_sns" {
diff --git a/apps/lambda_function_sns_no_vpc/sqs.tf b/apps/lambda_function_sns_no_vpc/sqs.tf
index 0d1cb8f6..0e00d266 100644
--- a/apps/lambda_function_sns_no_vpc/sqs.tf
+++ b/apps/lambda_function_sns_no_vpc/sqs.tf
@@ -1,7 +1,7 @@
 resource "aws_sqs_queue" "lambda_error_queue" {
   name                      = "${var.app_name}-ERROR"
   message_retention_seconds = 1209600
-  tags = "${local.tags}"
+  tags                      = "${local.tags}"
 }
 
 
@@ -28,4 +28,4 @@ resource "aws_sqs_queue_policy" "lambda_error_queue_policy" {
   ]
 }
 POLICY
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_sns_no_vpc/variables.tf b/apps/lambda_function_sns_no_vpc/variables.tf
index de3b5aa4..f76c6565 100644
--- a/apps/lambda_function_sns_no_vpc/variables.tf
+++ b/apps/lambda_function_sns_no_vpc/variables.tf
@@ -1,9 +1,7 @@
 variable "region" {
   default = "eu-west-1"
 }
-variable "account_type" {
-  default = "sandbox"
-}
+variable "account_type" {}
 variable "tags_business_unit" {
   default = "Albumprinter"
 }
@@ -51,13 +49,13 @@ variable "vpc_enabled" {
 
 variable "response_template" {
   type = "map"
-  default ={
+  default = {
     "application/json" = ""
   }
 }
 
 variable "iam_policy_document" {
-  default =<<EOF
+  default = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -121,7 +119,7 @@ variable "alarm_action_arn" {
 variable "retention_days" {
   default = "30"
 }
-variable "reserved_concurrent_executions" { 
+variable "reserved_concurrent_executions" {
   default = -1
 }
 variable "sns_subscription_filters" {
@@ -129,4 +127,4 @@ variable "sns_subscription_filters" {
 }
 variable "enable_cloudwatch_alarms" {
   default = "1"
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_sqs_no_vpc/cloudwatch.tf b/apps/lambda_function_sqs_no_vpc/cloudwatch.tf
index 4dca9654..12f4cff9 100644
--- a/apps/lambda_function_sqs_no_vpc/cloudwatch.tf
+++ b/apps/lambda_function_sqs_no_vpc/cloudwatch.tf
@@ -1,35 +1,34 @@
 module "lambda_app_cloudwatch" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//apps/cloudwatch_lambda"
-  source = "../../apps/cloudwatch_lambda"
-  app_name = "${var.app_name}"
-  log_group_name = "/aws/lambda/${var.app_name}"
-  alarm_threshold = "${var.lambda_memory_alert_threshold}"
-  alarm_action_arn = "${var.alarm_action_arn}"
-  environment = "${var.environment}"
-  tags_team = "${var.tags_team}"
-  tags_domain = "${var.tags_domain}"
-  tags_purpose = "${var.tags_purpose}"
-  tags_cost_center = "${var.tags_cost_center}"
-  description = "${var.description}"
-  retention_days = "${var.retention_days}"  
+  source                   = "../../apps/cloudwatch_lambda"
+  app_name                 = "${var.app_name}"
+  log_group_name           = "/aws/lambda/${var.app_name}"
+  alarm_threshold          = "${var.lambda_memory_alert_threshold}"
+  alarm_action_arn         = "${var.alarm_action_arn}"
+  environment              = "${var.environment}"
+  tags_team                = "${var.tags_team}"
+  tags_domain              = "${var.tags_domain}"
+  tags_purpose             = "${var.tags_purpose}"
+  tags_cost_center         = "${var.tags_cost_center}"
+  description              = "${var.description}"
+  retention_days           = "${var.retention_days}"
   enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
-   aws = "aws"
+    aws = "aws"
   }
 }
 
 resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm" {
-  alarm_name                = "${var.app_name}-STALE-MESSAGES-ALARM"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateAgeOfOldestMessage"
-  namespace                 = "AWS/SQS"
-  period                    = "3600"  // 1 hour
-  statistic                 = "Maximum"
-  threshold                 = "3600" // 1 hour
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.alarm_action_arn}"]
-  count                     = "${var.enable_cloudwatch_alarms}"
+  alarm_name          = "${var.app_name}-STALE-MESSAGES-ALARM"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateAgeOfOldestMessage"
+  namespace           = "AWS/SQS"
+  period              = "3600" // 1 hour
+  statistic           = "Maximum"
+  threshold           = "3600" // 1 hour
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.alarm_action_arn}"]
+  count               = "${var.enable_cloudwatch_alarms}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_queue.name}"
   }
@@ -38,18 +37,18 @@ resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm" {
 
 
 resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_1" {
-  alarm_name                = "${var.app_name}-ERROR-MESSAGES-ALARM-1"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateAgeOfOldestMessage"
-  namespace                 = "AWS/SQS"
-  period                    = "60"  // 1 minute
-  statistic                 = "Minimum"
-  threshold                 = "60" // 1 minute
-  treat_missing_data        = "notBreaching"
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.alarm_action_arn}"]
-  count                     = "${var.enable_cloudwatch_alarms}"
+  alarm_name          = "${var.app_name}-ERROR-MESSAGES-ALARM-1"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateAgeOfOldestMessage"
+  namespace           = "AWS/SQS"
+  period              = "60" // 1 minute
+  statistic           = "Minimum"
+  threshold           = "60" // 1 minute
+  treat_missing_data  = "notBreaching"
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.alarm_action_arn}"]
+  count               = "${var.enable_cloudwatch_alarms}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_error_queue.name}"
   }
@@ -57,18 +56,18 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_1" {
 }
 
 resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_2" {
-  alarm_name                = "${var.app_name}-ERROR-MESSAGES-ALARM-2"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateAgeOfOldestMessage"
-  namespace                 = "AWS/SQS"
-  period                    = "3600"  // 1 hour
-  statistic                 = "Maximum"
-  threshold                 = "3600" // 1 hour
-  treat_missing_data        = "notBreaching"
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.alarm_action_arn}"]
-  count                     = "${var.enable_cloudwatch_alarms}"
+  alarm_name          = "${var.app_name}-ERROR-MESSAGES-ALARM-2"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateAgeOfOldestMessage"
+  namespace           = "AWS/SQS"
+  period              = "3600" // 1 hour
+  statistic           = "Maximum"
+  threshold           = "3600" // 1 hour
+  treat_missing_data  = "notBreaching"
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.alarm_action_arn}"]
+  count               = "${var.enable_cloudwatch_alarms}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_error_queue.name}"
   }
@@ -76,20 +75,20 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_2" {
 }
 
 resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_3" {
-  alarm_name                = "${var.app_name}-ERROR-MESSAGES-ALARM-3"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateNumberOfMessagesVisible"
-  namespace                 = "AWS/SQS"
-  period                    = "900"  // 15 minutes
-  statistic                 = "Maximum"
-  threshold                 = "10" // 1 hour
-  treat_missing_data        = "notBreaching"
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.alarm_action_arn}"]
-  count                     = "${var.enable_cloudwatch_alarms}"
+  alarm_name          = "${var.app_name}-ERROR-MESSAGES-ALARM-3"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateNumberOfMessagesVisible"
+  namespace           = "AWS/SQS"
+  period              = "900" // 15 minutes
+  statistic           = "Maximum"
+  threshold           = "10" // 1 hour
+  treat_missing_data  = "notBreaching"
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.alarm_action_arn}"]
+  count               = "${var.enable_cloudwatch_alarms}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_error_queue.name}"
   }
   tags = "${local.tags}"
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_sqs_no_vpc/lambda.tf b/apps/lambda_function_sqs_no_vpc/lambda.tf
index 25f1db7b..7857415b 100644
--- a/apps/lambda_function_sqs_no_vpc/lambda.tf
+++ b/apps/lambda_function_sqs_no_vpc/lambda.tf
@@ -12,32 +12,32 @@ resource "aws_lambda_function" "app" {
   s3_bucket = "${var.lambda_bucket_name}"
   s3_key = "${module.lambda_s3_bucket_object.key}"
   function_name = "${var.app_name}"
-  description = "${var.description}"
-  role = "${aws_iam_role.iam_for_app.arn}"
-  handler = "${var.handler}"
-  runtime = "${var.runtime}"
-  memory_size = "${var.memory_size}"
-  timeout = "${var.timeout}"
+  description   = "${var.description}"
+  role          = "${aws_iam_role.iam_for_app.arn}"
+  handler       = "${var.handler}"
+  runtime       = "${var.runtime}"
+  memory_size   = "${var.memory_size}"
+  timeout       = "${var.timeout}"
   environment {
     variables = "${var.variables}"
   }
   tracing_config {
     mode = "${var.tracing_config}"
   }
-  count            = "${var.enabled}"
-  tags = "${local.tags}"
+  count                          = "${var.enabled}"
+  tags                           = "${local.tags}"
   reserved_concurrent_executions = "${var.reserved_concurrent_executions}"
 }
 
 resource "aws_lambda_event_source_mapping" "event_source_mapping" {
-  batch_size        = 1
-  event_source_arn  = "${aws_sqs_queue.sqs_queue.arn}"
-  function_name     = "${aws_lambda_function.app.arn}"
-  enabled           = "${var.event_source_mapping_active}"
+  batch_size       = 1
+  event_source_arn = "${aws_sqs_queue.sqs_queue.arn}"
+  function_name    = "${aws_lambda_function.app.arn}"
+  enabled          = "${var.event_source_mapping_active}"
 }
 
 resource "aws_iam_role" "iam_for_app" {
-  name = "${var.app_name}"
+  name               = "${var.app_name}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
diff --git a/apps/lambda_function_sqs_no_vpc/main.tf b/apps/lambda_function_sqs_no_vpc/main.tf
index cdabdb09..b21d3b6a 100644
--- a/apps/lambda_function_sqs_no_vpc/main.tf
+++ b/apps/lambda_function_sqs_no_vpc/main.tf
@@ -1,10 +1 @@
-provider "aws" {
-}
-
-module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
-  providers = {
-    aws = "aws"
-  } 
-}
+provider "aws" {}
diff --git a/apps/lambda_function_sqs_no_vpc/variables.tf b/apps/lambda_function_sqs_no_vpc/variables.tf
index 4ede1f1a..b6c1ac04 100644
--- a/apps/lambda_function_sqs_no_vpc/variables.tf
+++ b/apps/lambda_function_sqs_no_vpc/variables.tf
@@ -1,9 +1,7 @@
 variable "region" {
   default = "eu-west-1"
 }
-variable "account_type" {
-  default = "sandbox"
-}
+variable "account_type" {}
 variable "tags_business_unit" {
   default = "Albumprinter"
 }
@@ -55,13 +53,13 @@ variable "event_source_mapping_active" {
 
 variable "response_template" {
   type = "map"
-  default ={
+  default = {
     "application/json" = ""
   }
 }
 
 variable "iam_policy_document" {
-  default =<<EOF
+  default = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -119,7 +117,7 @@ variable "alarm_action_arn" {
 variable "retention_days" {
   default = "30"
 }
-variable "reserved_concurrent_executions" { 
+variable "reserved_concurrent_executions" {
   default = -1
 }
 variable "visibility_timeout_seconds" {
@@ -142,4 +140,4 @@ variable "sqs_policy_statement" {
 
 variable "tracing_config" {
   default = "PassThrough"
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_sqs_vpc/cloudwatch.tf b/apps/lambda_function_sqs_vpc/cloudwatch.tf
index 4dca9654..12f4cff9 100644
--- a/apps/lambda_function_sqs_vpc/cloudwatch.tf
+++ b/apps/lambda_function_sqs_vpc/cloudwatch.tf
@@ -1,35 +1,34 @@
 module "lambda_app_cloudwatch" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//apps/cloudwatch_lambda"
-  source = "../../apps/cloudwatch_lambda"
-  app_name = "${var.app_name}"
-  log_group_name = "/aws/lambda/${var.app_name}"
-  alarm_threshold = "${var.lambda_memory_alert_threshold}"
-  alarm_action_arn = "${var.alarm_action_arn}"
-  environment = "${var.environment}"
-  tags_team = "${var.tags_team}"
-  tags_domain = "${var.tags_domain}"
-  tags_purpose = "${var.tags_purpose}"
-  tags_cost_center = "${var.tags_cost_center}"
-  description = "${var.description}"
-  retention_days = "${var.retention_days}"  
+  source                   = "../../apps/cloudwatch_lambda"
+  app_name                 = "${var.app_name}"
+  log_group_name           = "/aws/lambda/${var.app_name}"
+  alarm_threshold          = "${var.lambda_memory_alert_threshold}"
+  alarm_action_arn         = "${var.alarm_action_arn}"
+  environment              = "${var.environment}"
+  tags_team                = "${var.tags_team}"
+  tags_domain              = "${var.tags_domain}"
+  tags_purpose             = "${var.tags_purpose}"
+  tags_cost_center         = "${var.tags_cost_center}"
+  description              = "${var.description}"
+  retention_days           = "${var.retention_days}"
   enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
-   aws = "aws"
+    aws = "aws"
   }
 }
 
 resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm" {
-  alarm_name                = "${var.app_name}-STALE-MESSAGES-ALARM"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateAgeOfOldestMessage"
-  namespace                 = "AWS/SQS"
-  period                    = "3600"  // 1 hour
-  statistic                 = "Maximum"
-  threshold                 = "3600" // 1 hour
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.alarm_action_arn}"]
-  count                     = "${var.enable_cloudwatch_alarms}"
+  alarm_name          = "${var.app_name}-STALE-MESSAGES-ALARM"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateAgeOfOldestMessage"
+  namespace           = "AWS/SQS"
+  period              = "3600" // 1 hour
+  statistic           = "Maximum"
+  threshold           = "3600" // 1 hour
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.alarm_action_arn}"]
+  count               = "${var.enable_cloudwatch_alarms}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_queue.name}"
   }
@@ -38,18 +37,18 @@ resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm" {
 
 
 resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_1" {
-  alarm_name                = "${var.app_name}-ERROR-MESSAGES-ALARM-1"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateAgeOfOldestMessage"
-  namespace                 = "AWS/SQS"
-  period                    = "60"  // 1 minute
-  statistic                 = "Minimum"
-  threshold                 = "60" // 1 minute
-  treat_missing_data        = "notBreaching"
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.alarm_action_arn}"]
-  count                     = "${var.enable_cloudwatch_alarms}"
+  alarm_name          = "${var.app_name}-ERROR-MESSAGES-ALARM-1"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateAgeOfOldestMessage"
+  namespace           = "AWS/SQS"
+  period              = "60" // 1 minute
+  statistic           = "Minimum"
+  threshold           = "60" // 1 minute
+  treat_missing_data  = "notBreaching"
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.alarm_action_arn}"]
+  count               = "${var.enable_cloudwatch_alarms}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_error_queue.name}"
   }
@@ -57,18 +56,18 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_1" {
 }
 
 resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_2" {
-  alarm_name                = "${var.app_name}-ERROR-MESSAGES-ALARM-2"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateAgeOfOldestMessage"
-  namespace                 = "AWS/SQS"
-  period                    = "3600"  // 1 hour
-  statistic                 = "Maximum"
-  threshold                 = "3600" // 1 hour
-  treat_missing_data        = "notBreaching"
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.alarm_action_arn}"]
-  count                     = "${var.enable_cloudwatch_alarms}"
+  alarm_name          = "${var.app_name}-ERROR-MESSAGES-ALARM-2"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateAgeOfOldestMessage"
+  namespace           = "AWS/SQS"
+  period              = "3600" // 1 hour
+  statistic           = "Maximum"
+  threshold           = "3600" // 1 hour
+  treat_missing_data  = "notBreaching"
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.alarm_action_arn}"]
+  count               = "${var.enable_cloudwatch_alarms}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_error_queue.name}"
   }
@@ -76,20 +75,20 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_2" {
 }
 
 resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_3" {
-  alarm_name                = "${var.app_name}-ERROR-MESSAGES-ALARM-3"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateNumberOfMessagesVisible"
-  namespace                 = "AWS/SQS"
-  period                    = "900"  // 15 minutes
-  statistic                 = "Maximum"
-  threshold                 = "10" // 1 hour
-  treat_missing_data        = "notBreaching"
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.alarm_action_arn}"]
-  count                     = "${var.enable_cloudwatch_alarms}"
+  alarm_name          = "${var.app_name}-ERROR-MESSAGES-ALARM-3"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateNumberOfMessagesVisible"
+  namespace           = "AWS/SQS"
+  period              = "900" // 15 minutes
+  statistic           = "Maximum"
+  threshold           = "10" // 1 hour
+  treat_missing_data  = "notBreaching"
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.alarm_action_arn}"]
+  count               = "${var.enable_cloudwatch_alarms}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_error_queue.name}"
   }
   tags = "${local.tags}"
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_sqs_vpc/lambda.tf b/apps/lambda_function_sqs_vpc/lambda.tf
index 7cd0dac6..723e857c 100644
--- a/apps/lambda_function_sqs_vpc/lambda.tf
+++ b/apps/lambda_function_sqs_vpc/lambda.tf
@@ -12,14 +12,14 @@ resource "aws_lambda_function" "app" {
   s3_bucket = "${var.lambda_bucket_name}"
   s3_key = "${module.lambda_s3_bucket_object.key}"
   function_name = "${var.app_name}"
-  description = "${var.description}"
-  role = "${aws_iam_role.iam_for_app.arn}"
-  handler = "${var.handler}"
-  runtime = "${var.runtime}"
-  memory_size = "${var.memory_size}"
-  timeout = "${var.timeout}"
+  description   = "${var.description}"
+  role          = "${aws_iam_role.iam_for_app.arn}"
+  handler       = "${var.handler}"
+  runtime       = "${var.runtime}"
+  memory_size   = "${var.memory_size}"
+  timeout       = "${var.timeout}"
   vpc_config = {
-    subnet_ids = ["${split( ",", var.private == 1 ?   join(",", module.aws_core_data.private_subnets) :  join(",", concat(module.aws_core_data.private_subnets,module.aws_core_data.public_subnets)))}"]
+    subnet_ids         = ["${split(",", var.private == 1 ? join(",", module.aws_core_data.private_subnets) : join(",", concat(module.aws_core_data.private_subnets, module.aws_core_data.public_subnets)))}"]
     security_group_ids = ["${aws_security_group.sg_for_app.id}"]
   }
   environment {
@@ -28,20 +28,20 @@ resource "aws_lambda_function" "app" {
   tracing_config {
     mode = "${var.tracing_config}"
   }
-  count            = "${var.enabled}"
-  tags = "${local.tags}"
+  count                          = "${var.enabled}"
+  tags                           = "${local.tags}"
   reserved_concurrent_executions = "${var.reserved_concurrent_executions}"
 }
 
 resource "aws_lambda_event_source_mapping" "event_source_mapping" {
-  batch_size        = 1
-  event_source_arn  = "${aws_sqs_queue.sqs_queue.arn}"
-  function_name     = "${aws_lambda_function.app.arn}"
-  enabled           = "${var.event_source_mapping_active}"
+  batch_size       = 1
+  event_source_arn = "${aws_sqs_queue.sqs_queue.arn}"
+  function_name    = "${aws_lambda_function.app.arn}"
+  enabled          = "${var.event_source_mapping_active}"
 }
 
 resource "aws_iam_role" "iam_for_app" {
-  name = "${var.app_name}"
+  name               = "${var.app_name}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -104,4 +104,4 @@ resource "aws_security_group" "sg_for_app" {
   }
 
   tags = "${local.tags}"
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_sqs_vpc/main.tf b/apps/lambda_function_sqs_vpc/main.tf
index cdabdb09..0ba4da65 100644
--- a/apps/lambda_function_sqs_vpc/main.tf
+++ b/apps/lambda_function_sqs_vpc/main.tf
@@ -1,10 +1,9 @@
-provider "aws" {
-}
+provider "aws" {}
 
 module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
+  source       = "../../data_providers/shared-vpc-data"
+  account_type = "${var.account_type}"
   providers = {
     aws = "aws"
-  } 
+  }
 }
diff --git a/apps/lambda_function_sqs_vpc/sqs.tf b/apps/lambda_function_sqs_vpc/sqs.tf
index 226a2d35..c9763458 100644
--- a/apps/lambda_function_sqs_vpc/sqs.tf
+++ b/apps/lambda_function_sqs_vpc/sqs.tf
@@ -1,9 +1,9 @@
 
 #ERROR QUEUE
 resource "aws_sqs_queue" "sqs_error_queue" {
-  name                        = "${var.sqs_name}-ERROR"
-  message_retention_seconds   = 1209600
-  tags                        = "${local.tags}"
+  name                      = "${var.sqs_name}-ERROR"
+  message_retention_seconds = 1209600
+  tags                      = "${local.tags}"
 }
 
 
@@ -34,19 +34,19 @@ POLICY
 
 
 resource "aws_sqs_queue" "sqs_queue" {
-  name                          = "${var.sqs_name}"
-  message_retention_seconds     = "${var.message_retention_seconds}"
-  receive_wait_time_seconds     = "${var.receive_wait_time_seconds}"
-  visibility_timeout_seconds    = "${var.visibility_timeout_seconds}"
-  redrive_policy                = "{\"deadLetterTargetArn\":\"${aws_sqs_queue.sqs_error_queue.arn}\",\"maxReceiveCount\":${var.redrive_policy_retry_count}}"  
+  name = "${var.sqs_name}"
+  message_retention_seconds = "${var.message_retention_seconds}"
+  receive_wait_time_seconds = "${var.receive_wait_time_seconds}"
+  visibility_timeout_seconds = "${var.visibility_timeout_seconds}"
+  redrive_policy = "{\"deadLetterTargetArn\":\"${aws_sqs_queue.sqs_error_queue.arn}\",\"maxReceiveCount\":${var.redrive_policy_retry_count}}"
   tags = {
-    Domain                      = "${var.tags_domain}"
-    "Business Unit"             = "${var.tags_business_unit}"
-    Environment                 = "${var.environment}"
-    "Cost Center"               = "${var.tags_cost_center}"
-    Team                        = "${var.tags_team}"
-    Purpose                     = "${var.tags_purpose}"
-    Description                 = "${var.description}"
+    Domain = "${var.tags_domain}"
+    "Business Unit" = "${var.tags_business_unit}"
+    Environment = "${var.environment}"
+    "Cost Center" = "${var.tags_cost_center}"
+    Team = "${var.tags_team}"
+    Purpose = "${var.tags_purpose}"
+    Description = "${var.description}"
   }
 }
 
diff --git a/apps/lambda_function_sqs_vpc/variables.tf b/apps/lambda_function_sqs_vpc/variables.tf
index 4ede1f1a..b6c1ac04 100644
--- a/apps/lambda_function_sqs_vpc/variables.tf
+++ b/apps/lambda_function_sqs_vpc/variables.tf
@@ -1,9 +1,7 @@
 variable "region" {
   default = "eu-west-1"
 }
-variable "account_type" {
-  default = "sandbox"
-}
+variable "account_type" {}
 variable "tags_business_unit" {
   default = "Albumprinter"
 }
@@ -55,13 +53,13 @@ variable "event_source_mapping_active" {
 
 variable "response_template" {
   type = "map"
-  default ={
+  default = {
     "application/json" = ""
   }
 }
 
 variable "iam_policy_document" {
-  default =<<EOF
+  default = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -119,7 +117,7 @@ variable "alarm_action_arn" {
 variable "retention_days" {
   default = "30"
 }
-variable "reserved_concurrent_executions" { 
+variable "reserved_concurrent_executions" {
   default = -1
 }
 variable "visibility_timeout_seconds" {
@@ -142,4 +140,4 @@ variable "sqs_policy_statement" {
 
 variable "tracing_config" {
   default = "PassThrough"
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_vpc/cloudwatch.tf b/apps/lambda_function_vpc/cloudwatch.tf
index a8da1883..e3c80e6c 100644
--- a/apps/lambda_function_vpc/cloudwatch.tf
+++ b/apps/lambda_function_vpc/cloudwatch.tf
@@ -1,19 +1,18 @@
 module "lambda_app_cloudwatch" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//apps/cloudwatch_lambda"
-  source = "../../apps/cloudwatch_lambda"
-  app_name = "${var.app_name}"
-  log_group_name = "/aws/lambda/${var.app_name}"
-  alarm_threshold = "${var.lambda_memory_alert_threshold}"
-  alarm_action_arn = "${var.alarm_action_arn}"
-  environment = "${var.environment}"
-  tags_team = "${var.tags_team}"
-  tags_domain = "${var.tags_domain}"
-  tags_cost_center = "${var.tags_cost_center}"
-  tags_purpose = "${var.tags_purpose}"
-  description = "${var.description}"
-  retention_days = "${var.retention_days}"  
+  source                   = "../../apps/cloudwatch_lambda"
+  app_name                 = "${var.app_name}"
+  log_group_name           = "/aws/lambda/${var.app_name}"
+  alarm_threshold          = "${var.lambda_memory_alert_threshold}"
+  alarm_action_arn         = "${var.alarm_action_arn}"
+  environment              = "${var.environment}"
+  tags_team                = "${var.tags_team}"
+  tags_domain              = "${var.tags_domain}"
+  tags_cost_center         = "${var.tags_cost_center}"
+  tags_purpose             = "${var.tags_purpose}"
+  description              = "${var.description}"
+  retention_days           = "${var.retention_days}"
   enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
     aws = "aws"
   }
-}
\ No newline at end of file
+}
diff --git a/apps/lambda_function_vpc/lambda.tf b/apps/lambda_function_vpc/lambda.tf
index 5e57f9c3..fcb4e1da 100644
--- a/apps/lambda_function_vpc/lambda.tf
+++ b/apps/lambda_function_vpc/lambda.tf
@@ -17,39 +17,39 @@ resource "aws_lambda_function" "app" {
   handler = "${var.handler}"
   runtime = "${var.runtime}"
   memory_size = "${var.memory_size}"
-  timeout = "${var.timeout}"
+  timeout     = "${var.timeout}"
   vpc_config = {
-    subnet_ids = ["${split( ",", var.private == 1 ?   join(",", module.aws_core_data.private_subnets) :  join(",", concat(module.aws_core_data.private_subnets,module.aws_core_data.public_subnets)))}"]
+    subnet_ids         = ["${split(",", var.private == 1 ? join(",", module.aws_core_data.private_subnets) : join(",", concat(module.aws_core_data.private_subnets, module.aws_core_data.public_subnets)))}"]
     security_group_ids = ["${aws_security_group.sg_for_app.id}"]
   }
   environment {
     variables = "${var.variables}"
   }
-  count            = "${var.enabled}"
-  tags = "${local.tags}"
+  count                          = "${var.enabled}"
+  tags                           = "${local.tags}"
   reserved_concurrent_executions = "${var.reserved_concurrent_executions}"
 }
 
 resource "aws_iam_role" "iam_for_app" {
-  name = "${var.app_name}"
+  name               = "${var.app_name}"
   assume_role_policy = "${var.assume_role_policy_document}"
 }
 
 resource "aws_iam_role_policy" "iam_policy_for_app" {
-  name = "${var.app_name}"
-  role = "${aws_iam_role.iam_for_app.id}"
+  name   = "${var.app_name}"
+  role   = "${aws_iam_role.iam_for_app.id}"
   policy = "${var.iam_policy_document}"
 }
 
 resource "aws_security_group" "sg_for_app" {
-  name = "${var.app_name}"
+  name        = "${var.app_name}"
   description = "Allow all inbound traffic for the scheduled lambda function"
-  vpc_id = "${module.aws_core_data.vpc_id}"
+  vpc_id      = "${module.aws_core_data.vpc_id}"
 
   ingress {
     from_port = 0
-    to_port = 0
-    protocol = "-1"
+    to_port   = 0
+    protocol  = "-1"
     cidr_blocks = [
       "185.184.204.70/32",
       "62.97.245.10/32",
@@ -65,9 +65,9 @@ resource "aws_security_group" "sg_for_app" {
   }
 
   egress {
-    from_port = 0
-    to_port = 0
-    protocol = "-1"
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
     cidr_blocks = ["0.0.0.0/0"]
   }
 
diff --git a/apps/lambda_function_vpc/main.tf b/apps/lambda_function_vpc/main.tf
index fc27f6a2..0ba4da65 100644
--- a/apps/lambda_function_vpc/main.tf
+++ b/apps/lambda_function_vpc/main.tf
@@ -1,9 +1,8 @@
-provider "aws" {
-}
+provider "aws" {}
 
 module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
+  source       = "../../data_providers/shared-vpc-data"
+  account_type = "${var.account_type}"
   providers = {
     aws = "aws"
   }
diff --git a/apps/lambda_function_vpc/variables.tf b/apps/lambda_function_vpc/variables.tf
index 02107be3..12b5e56c 100644
--- a/apps/lambda_function_vpc/variables.tf
+++ b/apps/lambda_function_vpc/variables.tf
@@ -1,9 +1,7 @@
 variable "region" {
   default = "eu-west-1"
 }
-variable "account_type" {
-  default = "sandbox"
-}
+variable "account_type" {}
 variable "tags_business_unit" {
   default = "Albumprinter"
 }
@@ -29,11 +27,11 @@ variable "environment" {}
 variable "variables" {
   type = "map"
   default = {
-    ENCODING="utf-8"
-//    SUMO_ENDPOINT=""
-//    SOURCE_CATEGORY_OVERRIDE=""
-//    SOURCE_HOST_OVERRIDE=""
-//    SOURCE_NAME_OVERRIDE=""
+    ENCODING = "utf-8"
+    //    SUMO_ENDPOINT=""
+    //    SOURCE_CATEGORY_OVERRIDE=""
+    //    SOURCE_HOST_OVERRIDE=""
+    //    SOURCE_NAME_OVERRIDE=""
   }
 }
 
@@ -52,7 +50,7 @@ variable "private" {
 }
 
 variable "iam_policy_document" {
-  default =<<EOF
+  default = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -118,7 +116,7 @@ EOF
 }
 
 variable "assume_role_policy_document" {
-  default =<<EOF
+  default = <<EOF
 {
   "Version": "2012-10-17",
   "Statement": [
@@ -151,4 +149,4 @@ variable "reserved_concurrent_executions" {
 }
 variable "enable_cloudwatch_alarms" {
   default = 1
-}
\ No newline at end of file
+}
diff --git a/apps/rds_cluster/main.tf b/apps/rds_cluster/main.tf
index 02b5d560..3ccb5090 100644
--- a/apps/rds_cluster/main.tf
+++ b/apps/rds_cluster/main.tf
@@ -1,9 +1,9 @@
 provider "aws" {}
 
-module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
 
+module "aws_core_data" {
+  source       = "../../data_providers/shared-vpc-data"
+  account_type = "${var.account_type}"
   providers = {
     aws = "aws"
   }
diff --git a/apps/rds_cluster/rds.tf b/apps/rds_cluster/rds.tf
index 8216c819..6e34a992 100644
--- a/apps/rds_cluster/rds.tf
+++ b/apps/rds_cluster/rds.tf
@@ -36,16 +36,16 @@ resource "aws_db_instance" "db_instance" {
   apply_immediately           = "${var.apply_immediately}"
   maintenance_window          = "${var.maintenance_window}"
 
-  monitoring_interval = "${var.monitoring_interval}"
+  monitoring_interval                 = "${var.monitoring_interval}"
   iam_database_authentication_enabled = "${var.iam_database_authentication_enabled}"
 
   tags = "${merge(
-        map(
-          "Name", "${lower(var.name)}-rds-${lower(var.environment)}", 
-          "Description", "${lower(var.name)}-rds-${lower(var.environment)}  aws_db_instance ${var.description}"
-        ),
-        local.common_tags
-    )}"
+    map(
+      "Name", "${lower(var.name)}-rds-${lower(var.environment)}",
+      "Description", "${lower(var.name)}-rds-${lower(var.environment)}  aws_db_instance ${var.description}"
+    ),
+    local.common_tags
+  )}"
 
   lifecycle {
     create_before_destroy = true
@@ -61,7 +61,7 @@ resource "aws_db_instance" "db_instance" {
 resource "aws_rds_cluster_instance" "rds_cluster_instance" {
   count = "${var.create_rds_cluster ? var.number_of_instances_in_the_cluster : 0}"
 
-  identifier         = "${lower(var.name)}-cluster-${lower(var.environment)}-${count.index+1}"
+  identifier         = "${lower(var.name)}-cluster-${lower(var.environment)}-${count.index + 1}"
   cluster_identifier = "${aws_rds_cluster.rds_cluster.id}"
   instance_class     = "${var.instance_class}"
 
@@ -70,12 +70,12 @@ resource "aws_rds_cluster_instance" "rds_cluster_instance" {
   db_parameter_group_name = "${var.instance_parameter_group_name}"
 
   tags = "${merge(
-        map(
-          "Name", "${lower(var.name)}-cluster-${lower(var.environment)}-${count.index+1}",
-          "Description", "${lower(var.name)}-cluster-${lower(var.environment)}-${count.index+1} ${var.description}"
-        ),
-        local.common_tags
-    )}"
+    map(
+      "Name", "${lower(var.name)}-cluster-${lower(var.environment)}-${count.index + 1}",
+      "Description", "${lower(var.name)}-cluster-${lower(var.environment)}-${count.index + 1} ${var.description}"
+    ),
+    local.common_tags
+  )}"
 
   depends_on = ["aws_rds_cluster.rds_cluster", "aws_db_subnet_group.db_subnet_group", "aws_db_parameter_group.db_parameter_group"]
 }
@@ -101,18 +101,18 @@ resource "aws_rds_cluster" "rds_cluster" {
   db_cluster_parameter_group_name = "${var.db_cluster_parameter_group_name}"
   availability_zones              = ["${split(",", (lookup(var.availability_zones, var.region)))}"]
 
-  database_name   = "${var.db_name}"
-  master_username = "${var.db_username}"
-  master_password = "${local.master_password}"
+  database_name                       = "${var.db_name}"
+  master_username                     = "${var.db_username}"
+  master_password                     = "${local.master_password}"
   iam_database_authentication_enabled = "${var.iam_database_authentication_enabled}"
 
   tags = "${merge(
-        map(
-          "Name", "${lower(var.name)}-cluster-${lower(var.environment)}",
-          "Description", "${lower(var.name)}-cluster-${lower(var.environment)} ${var.description}"
-        ),
-        local.common_tags
-    )}"
+    map(
+      "Name", "${lower(var.name)}-cluster-${lower(var.environment)}",
+      "Description", "${lower(var.name)}-cluster-${lower(var.environment)} ${var.description}"
+    ),
+    local.common_tags
+  )}"
 
   lifecycle {
     create_before_destroy = true
@@ -136,9 +136,9 @@ resource "aws_rds_cluster" "serverless_cluster" {
   db_subnet_group_name   = "${var.db_subnet_group_name == "" ? aws_db_subnet_group.db_subnet_group.name : var.db_subnet_group_name}"
   vpc_security_group_ids = ["${aws_security_group.db_security_group.id}"]
 
-  storage_encrypted               = "${var.storage_encrypted}"
-  apply_immediately               = "${var.apply_immediately}"
-  availability_zones              = ["${split(",", (lookup(var.availability_zones, var.region)))}"]
+  storage_encrypted  = "${var.storage_encrypted}"
+  apply_immediately  = "${var.apply_immediately}"
+  availability_zones = ["${split(",", (lookup(var.availability_zones, var.region)))}"]
 
   database_name   = "${var.db_name}"
   master_username = "${var.db_username}"
@@ -153,12 +153,12 @@ resource "aws_rds_cluster" "serverless_cluster" {
   }
 
   tags = "${merge(
-        map(
-          "Name", "${lower(var.name)}-cluster-${lower(var.environment)}",
-          "Description", "${lower(var.name)}-cluster-${lower(var.environment)} ${var.description}"
-        ),
-        local.common_tags
-    )}"
+    map(
+      "Name", "${lower(var.name)}-cluster-${lower(var.environment)}",
+      "Description", "${lower(var.name)}-cluster-${lower(var.environment)} ${var.description}"
+    ),
+    local.common_tags
+  )}"
 
   lifecycle {
     create_before_destroy = true
@@ -180,14 +180,14 @@ resource "aws_security_group" "db_security_group" {
     from_port       = "${lookup(var.default_ports, var.engine)}"
     to_port         = "${lookup(var.default_ports, var.engine)}"
     protocol        = "tcp"
-    security_groups = ["${aws_security_group.allow_db_access.id}", "${var.allowed_db_access_sg_groups}"] 
+    security_groups = ["${aws_security_group.allow_db_access.id}", "${var.allowed_db_access_sg_groups}"]
   }
 
   ingress {
-    from_port       = "${lookup(var.default_ports, var.engine)}"
-    to_port         = "${lookup(var.default_ports, var.engine)}"
-    protocol        = "tcp"
-    cidr_blocks     = ["${var.private_cidr_blocks}"] 
+    from_port   = "${lookup(var.default_ports, var.engine)}"
+    to_port     = "${lookup(var.default_ports, var.engine)}"
+    protocol    = "tcp"
+    cidr_blocks = ["${var.private_cidr_blocks}"]
   }
 
   egress {
@@ -198,12 +198,12 @@ resource "aws_security_group" "db_security_group" {
   }
 
   tags = "${merge(
-        map(
-          "Name", "${lower(var.name)}-db-security-group-for-${lower(var.environment)}",
-          "Description", "${lower(var.name)}-db-security-group-for-${lower(var.environment)} ${var.description}"
-        ),
-        local.common_tags
-    )}"
+    map(
+      "Name", "${lower(var.name)}-db-security-group-for-${lower(var.environment)}",
+      "Description", "${lower(var.name)}-db-security-group-for-${lower(var.environment)} ${var.description}"
+    ),
+    local.common_tags
+  )}"
   depends_on = ["aws_security_group.allow_db_access"]
 }
 
@@ -227,15 +227,15 @@ resource "aws_security_group" "allow_db_access" {
 resource "aws_db_subnet_group" "db_subnet_group" {
   name        = "${lower(var.name)}-db-subnet-group-for-${var.create_rds_cluster ? "cluster" : "rds"}-${lower(var.environment)}"
   description = "My ${lower(var.name)}-db_subnet_group-for-${var.create_rds_cluster ? "cluster" : "rds"}-${lower(var.environment)} group of subnets"
-  subnet_ids  = ["${split( ",", join(",", module.aws_core_data.private_subnets))}"]
+  subnet_ids  = ["${split(",", join(",", module.aws_core_data.private_subnets))}"]
 
   tags = "${merge(
-        map(
-          "Name", "${lower(var.name)}-db-subnet-group-for-${lower(var.environment)}",
-          "Description", "${lower(var.name)}-db-subnet-group-for-${lower(var.environment)} ${var.description}"
-        ),
-        local.common_tags
-    )}"
+    map(
+      "Name", "${lower(var.name)}-db-subnet-group-for-${lower(var.environment)}",
+      "Description", "${lower(var.name)}-db-subnet-group-for-${lower(var.environment)} ${var.description}"
+    ),
+    local.common_tags
+  )}"
 }
 
 #---------------------------------------------------
@@ -246,13 +246,13 @@ resource "aws_db_parameter_group" "db_parameter_group" {
 
   name        = "${lower(var.name)}-db-parameter-group-for-${var.create_rds_cluster ? "cluster" : "rds"}-${lower(var.environment)}"
   description = "RDS ${lower(var.name)}-db_parameter_group-for-${var.create_rds_cluster ? "cluster" : "rds"}-${lower(var.environment)} parameter group for ${var.engine}"
-  family      = "${length(var.db_parametergroup_family)>0? var.db_parametergroup_family : var.db_group_family[var.engine]}"
+  family      = "${length(var.db_parametergroup_family) > 0 ? var.db_parametergroup_family : var.db_group_family[var.engine]}"
   parameter   = "${var.default_db_parameters[var.engine]}"
 
   tags = "${merge(
-        map(
-          "Name", "${lower(var.name)}-db_parameter_group-${lower(var.environment)}"
-        ),
-        local.common_tags
-    )}"
+    map(
+      "Name", "${lower(var.name)}-db_parameter_group-${lower(var.environment)}"
+    ),
+    local.common_tags
+  )}"
 }
diff --git a/apps/rds_cluster/variables.tf b/apps/rds_cluster/variables.tf
index 6a9b98eb..72a87e8b 100644
--- a/apps/rds_cluster/variables.tf
+++ b/apps/rds_cluster/variables.tf
@@ -29,9 +29,7 @@ variable "region" {
   default     = "eu-west-1"
 }
 
-variable "account_type" {
-  default = "sandbox"
-}
+variable "account_type" {}
 
 variable "description" {
   description = "Why we just need description for description var?"
@@ -148,12 +146,12 @@ variable "default_ports" {
   type        = "map"
 
   default = {
-    mysql             = "3306"
-    aurora            = "3306"
+    mysql               = "3306"
+    aurora              = "3306"
     "aurora-mysql"      = "3306"
-    postgres          = "5432"
+    postgres            = "5432"
     "aurora-postgresql" = "5432"
-    oracle            = "1521"
+    oracle              = "1521"
   }
 }
 
@@ -233,15 +231,15 @@ variable "default_db_parameters" {
       },
     ]
 
-    postgres          = []
+    postgres            = []
     "aurora-postgresql" = []
-    oracle            = []
+    oracle              = []
   }
 }
 
 variable "db_parametergroup_family" {
-  description  = "desired parameter group family"
-  default = "mysql5.6"
+  description = "desired parameter group family"
+  default     = "mysql5.6"
 }
 
 variable "db_group_family" {
@@ -249,12 +247,12 @@ variable "db_group_family" {
   type        = "map"
 
   default = {
-    mysql             = "mysql5.6"
-    aurora            = "aurora5.6"
+    mysql               = "mysql5.6"
+    aurora              = "aurora5.6"
     "aurora-mysql"      = "aurora-mysql5.7"
-    postgres          = "postgres9.6"
+    postgres            = "postgres9.6"
     "aurora-postgresql" = "aurora-postgresql9.6"
-    oracle            = "oracle-ee-12.1"
+    oracle              = "oracle-ee-12.1"
   }
 }
 
diff --git a/apps/rds_mysql/main.tf b/apps/rds_mysql/main.tf
index fc27f6a2..48bd1540 100644
--- a/apps/rds_mysql/main.tf
+++ b/apps/rds_mysql/main.tf
@@ -2,8 +2,8 @@ provider "aws" {
 }
 
 module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
+  source       = "../../data_providers/shared-vpc-data"
+  account_type = "${var.account_type}"
   providers = {
     aws = "aws"
   }
diff --git a/apps/rds_mysql/outputs.tf b/apps/rds_mysql/outputs.tf
index 671bad09..0a7af185 100644
--- a/apps/rds_mysql/outputs.tf
+++ b/apps/rds_mysql/outputs.tf
@@ -16,5 +16,5 @@ output "db_admin_username" {
 
 output "db_admin_password" {
   sensitive = true
-  value = "${aws_db_instance.database.password}"
+  value     = "${aws_db_instance.database.password}"
 }
\ No newline at end of file
diff --git a/apps/rds_mysql/rds.tf b/apps/rds_mysql/rds.tf
index 2139931a..83b1f5f3 100644
--- a/apps/rds_mysql/rds.tf
+++ b/apps/rds_mysql/rds.tf
@@ -1,22 +1,8 @@
 resource "aws_security_group" "database" {
-  name = "${var.environment}-${var.app_name}"
+  name        = "${var.environment}-${var.app_name}"
   description = "RDS database security group"
 
-  ingress {
-    from_port = 3306
-    to_port = 3306
-    protocol = "tcp"
-    cidr_blocks = ["192.168.0.0/16", "77.60.83.148/32"]
-  }
-
-  egress {
-    from_port = 0
-    to_port = 65535
-    protocol = "tcp"
-    cidr_blocks = ["0.0.0.0/0"]
-  }
-
-  tags {
+  tags = {
     Domain          = "${var.tags_domain}"
     Name            = "${var.app_name}"
     "Business Unit" = "${var.tags_business_unit}"
@@ -30,36 +16,57 @@ resource "aws_security_group" "database" {
   vpc_id = "${module.aws_core_data.vpc_id}"
 }
 
+resource "aws_security_group_rule" "db_ingress" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.database.id}"
+  description       = "Allow access to the database"
+  from_port         = 3306
+  to_port           = 3306
+  protocol          = "tcp"
+  cidr_blocks       = ["${var.db_cidr}"]
+}
+resource "aws_security_group_rule" "db_egress" {
+  security_group_id = "${aws_security_group.database.id}"
+  description       = "Allow all outgoing"
+  type              = "egress"
+  from_port         = 0
+  to_port           = 0
+  protocol          = "-1"
+  cidr_blocks       = ["0.0.0.0/0"]
+}
+
+
 resource "aws_db_subnet_group" "database" {
-  name = "${var.environment}-${var.app_name}"
+  name        = "${var.environment}-${var.app_name}"
   description = "RDS subnet group"
-  subnet_ids = ["${split( ",", join(",", module.aws_core_data.private_subnets))}"]
+  subnet_ids  = ["${split(",", join(",", module.aws_core_data.private_subnets))}"]
 }
 
 resource "aws_db_instance" "database" {
   name = "${var.app_name}"
-//  depends_on = ["aws_db_subnet_group.database", "aws_security_group.database"]
-  identifier = "${var.environment}-${var.app_name}"
-  allocated_storage = "${var.db_storage_size}"
-  engine = "mysql"
-  engine_version = "${var.db_engine_version}"
-  instance_class = "${var.db_instance_size}"
-  username = "${var.db_admin_username}"
-  password = "${var.db_admin_password}"
-  db_subnet_group_name = "${aws_db_subnet_group.database.name}"
-  parameter_group_name = "${var.db_parameter_group}"
+  //  depends_on = ["aws_db_subnet_group.database", "aws_security_group.database"]
+  identifier                = "${var.environment}-${var.app_name}"
+  allocated_storage         = "${var.db_storage_size}"
+  engine                    = "mysql"
+  engine_version            = "${var.db_engine_version}"
+  instance_class            = "${var.db_instance_size}"
+  username                  = "${var.db_admin_username}"
+  password                  = "${var.db_admin_password}"
+  db_subnet_group_name      = "${aws_db_subnet_group.database.name}"
+  parameter_group_name      = "${var.db_parameter_group}"
   final_snapshot_identifier = "${var.environment}-${var.app_name}"
-  backup_retention_period = "${var.db_backup_retention_period}"
-  backup_window = "${var.db_backup_window}"
-  maintenance_window = "${var.db_maintenance_window}"
-  multi_az = "${var.db_multi_az}"
-  vpc_security_group_ids = ["${aws_security_group.database.id}"]
-  publicly_accessible = false
+  backup_retention_period   = "${var.db_backup_retention_period}"
+  backup_window             = "${var.db_backup_window}"
+  maintenance_window        = "${var.db_maintenance_window}"
+  multi_az                  = "${var.db_multi_az}"
+  vpc_security_group_ids    = ["${aws_security_group.database.id}"]
+  publicly_accessible       = false
   lifecycle {
     prevent_destroy = true
   }
 
-  tags {
+  copy_tags_to_snapshot     = true
+  tags = {
     Domain          = "${var.tags_domain}"
     Name            = "${var.app_name}"
     "Business Unit" = "${var.tags_business_unit}"
@@ -69,4 +76,4 @@ resource "aws_db_instance" "database" {
     Description     = "${var.description}"
     Environment     = "${var.environment}"
   }
-}
\ No newline at end of file
+}
diff --git a/apps/rds_mysql/variables.tf b/apps/rds_mysql/variables.tf
index 4e17a311..5e839a73 100644
--- a/apps/rds_mysql/variables.tf
+++ b/apps/rds_mysql/variables.tf
@@ -1,9 +1,7 @@
 variable "region" {
   default = "eu-west-1"
 }
-variable "account_type" {
-  default = "sandbox"
-}
+variable "account_type" {}
 variable "tags_business_unit" {
   default = "Albumprinter"
 }
@@ -19,7 +17,11 @@ variable "environment" {}
 
 variable "app_name" {
   description = "A value to append to the RDS identifer to create a unique name"
-  default = "rds-database"
+  default     = "rds-database"
+}
+variable "db_cidr" {
+  description = "cidr range that has access to the database. By default all the shared VPC ranges"
+  default     = "10.96.0.0/12"
 }
 
 variable "enabled" {
@@ -40,7 +42,7 @@ variable "db_instance_size" {
 
 variable "db_admin_username" {
   description = "The database admin username"
-  default = "rds_admin"
+  default     = "rds_admin"
 }
 
 variable "db_admin_password" {
@@ -49,25 +51,25 @@ variable "db_admin_password" {
 
 variable "db_parameter_group" {
   description = "The name of the parameter group for the database"
-  default = "default.mysql5.6"
+  default     = "default.mysql5.6"
 }
 
 variable "db_backup_window" {
   description = "The time period in which to backup the database"
-  default = "06:00-07:00"
+  default     = "06:00-07:00"
 }
 
 variable "db_maintenance_window" {
   description = "The time period in which to run maintenance on the database"
-  default = "sun:07:00-sun:07:30"
+  default     = "sun:07:00-sun:07:30"
 }
 
 variable "db_multi_az" {
   description = "Set whether the database should be multi AZ"
-  default = true
+  default     = true
 }
 
 variable "db_backup_retention_period" {
   description = "The database retention period"
-  default = 7
-}
\ No newline at end of file
+  default     = 7
+}
diff --git a/apps/sample_loadbalanced_application/main.tf b/apps/sample_loadbalanced_application/main.tf
index a2a2b045..5aca0c81 100644
--- a/apps/sample_loadbalanced_application/main.tf
+++ b/apps/sample_loadbalanced_application/main.tf
@@ -2,8 +2,8 @@ provider "aws" {
 }
 
 module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_core_data"
-  source = "../../data_providers/aws_core_data"
+  source       = "../../data_providers/shared-vpc-data"
+  account_type = "${var.account_type}"
   providers = {
     aws = "aws"
   }
diff --git a/apps/sample_loadbalanced_application/variables.tf b/apps/sample_loadbalanced_application/variables.tf
index b895525f..28366635 100644
--- a/apps/sample_loadbalanced_application/variables.tf
+++ b/apps/sample_loadbalanced_application/variables.tf
@@ -74,3 +74,5 @@ variable "user_data" {
 }
 
 variable "ssh_sg" {}
+
+variable "account_type" {}
diff --git a/apps/sns_topic/main.tf b/apps/sns_topic/main.tf
index 916861e9..b21d3b6a 100644
--- a/apps/sns_topic/main.tf
+++ b/apps/sns_topic/main.tf
@@ -1,10 +1 @@
-provider "aws" {
-}
-
-module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
-  providers = {
-   aws = "aws"
-  } 
-}
\ No newline at end of file
+provider "aws" {}
diff --git a/apps/sns_topic_subscription/main.tf b/apps/sns_topic_subscription/main.tf
index 53ae65ba..b21d3b6a 100644
--- a/apps/sns_topic_subscription/main.tf
+++ b/apps/sns_topic_subscription/main.tf
@@ -1,10 +1 @@
-provider "aws" {
-}
-
-module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
-  providers = {
-   aws = "aws"
-  }
-}
+provider "aws" {}
diff --git a/apps/sns_topic_subscription/variables.tf b/apps/sns_topic_subscription/variables.tf
index ead1cad0..ce0efe3c 100644
--- a/apps/sns_topic_subscription/variables.tf
+++ b/apps/sns_topic_subscription/variables.tf
@@ -1,9 +1,7 @@
 variable "region" {
   default = "eu-west-1"
 }
-variable "account_type" {
-  default = ""
-}
+variable "account_type" {}
 variable "tags_business_unit" {
   default = "Albumprinter"
 }
@@ -42,4 +40,4 @@ variable protocol {
 
 variable endpoint {
   default = ""
-}
\ No newline at end of file
+}
diff --git a/apps/sqs_consume_sns/cloudwatch.tf b/apps/sqs_consume_sns/cloudwatch.tf
index c66b780d..3084472c 100644
--- a/apps/sqs_consume_sns/cloudwatch.tf
+++ b/apps/sqs_consume_sns/cloudwatch.tf
@@ -1,15 +1,15 @@
 resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_1" {
-  alarm_name                = "${var.app_name}-STALE-MESSAGES-ALARM-1"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateAgeOfOldestMessage"
-  namespace                 = "AWS/SQS"
-  period                    = "900"  // 15 minutes
-  statistic                 = "Maximum"
-  threshold                 = "3600" // 1 hour
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.sns_alert_arn}"]
-  count                     = "${var.add_stale_message_cloudwatch}"
+  alarm_name          = "${var.app_name}-STALE-MESSAGES-ALARM-1"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateAgeOfOldestMessage"
+  namespace           = "AWS/SQS"
+  period              = "900" // 15 minutes
+  statistic           = "Maximum"
+  threshold           = "3600" // 1 hour
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.sns_alert_arn}"]
+  count               = "${var.add_stale_message_cloudwatch}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_queue.name}"
   }
@@ -17,17 +17,17 @@ resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_1" {
 }
 
 resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_2" {
-  alarm_name                = "${var.app_name}-STALE-MESSAGES-ALARM-2"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateAgeOfOldestMessage"
-  namespace                 = "AWS/SQS"
-  period                    = "10800" // 3 hours
-  statistic                 = "Maximum"
-  threshold                 = "86400" // 1 day
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.sns_alert_arn}"]
-  count                     = "${var.add_stale_message_cloudwatch}"
+  alarm_name          = "${var.app_name}-STALE-MESSAGES-ALARM-2"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateAgeOfOldestMessage"
+  namespace           = "AWS/SQS"
+  period              = "10800" // 3 hours
+  statistic           = "Maximum"
+  threshold           = "86400" // 1 day
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.sns_alert_arn}"]
+  count               = "${var.add_stale_message_cloudwatch}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_queue.name}"
   }
@@ -35,17 +35,17 @@ resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_2" {
 }
 
 resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_3" {
-  alarm_name                = "${var.app_name}-STALE-MESSAGES-ALARM-3"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateAgeOfOldestMessage"
-  namespace                 = "AWS/SQS"
-  period                    = "86400"  // 1 day
-  statistic                 = "Maximum"
-  threshold                 = "259200" // 3 days
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.sns_alert_arn}"]
-  count                     = "${var.add_stale_message_cloudwatch}"
+  alarm_name          = "${var.app_name}-STALE-MESSAGES-ALARM-3"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateAgeOfOldestMessage"
+  namespace           = "AWS/SQS"
+  period              = "86400" // 1 day
+  statistic           = "Maximum"
+  threshold           = "259200" // 3 days
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.sns_alert_arn}"]
+  count               = "${var.add_stale_message_cloudwatch}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_queue.name}"
   }
@@ -53,18 +53,18 @@ resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_3" {
 }
 
 resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_1" {
-  alarm_name                = "${var.app_name}-ERROR-MESSAGES-ALARM-1"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateAgeOfOldestMessage"
-  namespace                 = "AWS/SQS"
-  period                    = "60"  // 1 minute
-  statistic                 = "Minimum"
-  threshold                 = "60" // 1 minute
-  treat_missing_data        = "notBreaching"
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.sns_alert_arn}"]
-  count                     = "${var.add_error_messages_cloudwatch}"
+  alarm_name          = "${var.app_name}-ERROR-MESSAGES-ALARM-1"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateAgeOfOldestMessage"
+  namespace           = "AWS/SQS"
+  period              = "60" // 1 minute
+  statistic           = "Minimum"
+  threshold           = "60" // 1 minute
+  treat_missing_data  = "notBreaching"
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.sns_alert_arn}"]
+  count               = "${var.add_error_messages_cloudwatch}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_error_queue.name}"
   }
@@ -72,18 +72,18 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_1" {
 }
 
 resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_2" {
-  alarm_name                = "${var.app_name}-ERROR-MESSAGES-ALARM-2"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateAgeOfOldestMessage"
-  namespace                 = "AWS/SQS"
-  period                    = "3600"  // 1 hour
-  statistic                 = "Maximum"
-  threshold                 = "3600" // 1 hour
-  treat_missing_data        = "notBreaching"
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.sns_alert_arn}"]
-  count                     = "${var.add_error_messages_cloudwatch}"
+  alarm_name          = "${var.app_name}-ERROR-MESSAGES-ALARM-2"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateAgeOfOldestMessage"
+  namespace           = "AWS/SQS"
+  period              = "3600" // 1 hour
+  statistic           = "Maximum"
+  threshold           = "3600" // 1 hour
+  treat_missing_data  = "notBreaching"
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.sns_alert_arn}"]
+  count               = "${var.add_error_messages_cloudwatch}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_error_queue.name}"
   }
@@ -91,18 +91,18 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_2" {
 }
 
 resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_3" {
-  alarm_name                = "${var.app_name}-ERROR-MESSAGES-ALARM-3"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateNumberOfMessagesVisible"
-  namespace                 = "AWS/SQS"
-  period                    = "900"  // 15 minutes
-  statistic                 = "Maximum"
-  threshold                 = "10" // 1 hour
-  treat_missing_data        = "notBreaching"
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.sns_alert_arn}"]
-  count                     = "${var.add_error_messages_cloudwatch}"
+  alarm_name          = "${var.app_name}-ERROR-MESSAGES-ALARM-3"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateNumberOfMessagesVisible"
+  namespace           = "AWS/SQS"
+  period              = "900" // 15 minutes
+  statistic           = "Maximum"
+  threshold           = "10" // 1 hour
+  treat_missing_data  = "notBreaching"
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.sns_alert_arn}"]
+  count               = "${var.add_error_messages_cloudwatch}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_error_queue.name}"
   }
diff --git a/apps/sqs_consume_sns/main.tf b/apps/sqs_consume_sns/main.tf
index cf9246ea..b21d3b6a 100644
--- a/apps/sqs_consume_sns/main.tf
+++ b/apps/sqs_consume_sns/main.tf
@@ -1,10 +1 @@
-provider "aws" {
-}
-
-module "aws_core_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/aws_account_core_data"
-  source = "../../data_providers/aws_account_core_data"
-  providers = {
-   aws = "aws"
-  }
-}
\ No newline at end of file
+provider "aws" {}
diff --git a/apps/sqs_consume_sns/sns.tf b/apps/sqs_consume_sns/sns.tf
index 126a24f9..46a04cb2 100644
--- a/apps/sqs_consume_sns/sns.tf
+++ b/apps/sqs_consume_sns/sns.tf
@@ -9,8 +9,8 @@ resource "aws_sns_topic_subscription" "replay_topic_subscription" {
 }
 
 resource "aws_sns_topic_subscription" "sqs_event_topic_subscription" {
-  topic_arn = "${var.sns_subscription_arn}"
-  protocol  = "sqs"
-  endpoint  = "${aws_sqs_queue.sqs_queue.arn}"
+  topic_arn     = "${var.sns_subscription_arn}"
+  protocol      = "sqs"
+  endpoint      = "${aws_sqs_queue.sqs_queue.arn}"
   filter_policy = "${var.sns_subscription_filters}"
 }
diff --git a/apps/sqs_consume_sns/sqs.tf b/apps/sqs_consume_sns/sqs.tf
index c643da39..a8c3eff3 100644
--- a/apps/sqs_consume_sns/sqs.tf
+++ b/apps/sqs_consume_sns/sqs.tf
@@ -1,23 +1,23 @@
 resource "aws_sqs_queue" "sqs_queue" {
-  name                      = "${var.app_name}"
-  message_retention_seconds = "${var.message_retention_seconds}"
-  receive_wait_time_seconds = "${var.receive_wait_time_seconds}"
+  name                       = "${var.app_name}"
+  message_retention_seconds  = "${var.message_retention_seconds}"
+  receive_wait_time_seconds  = "${var.receive_wait_time_seconds}"
   visibility_timeout_seconds = "${var.visibility_timeout_seconds}"
-  redrive_policy            = "{\"deadLetterTargetArn\":\"${aws_sqs_queue.sqs_error_queue.arn}\",\"maxReceiveCount\":${var.redrive_policy_retry_count}}"  
+  redrive_policy             = "{\"deadLetterTargetArn\":\"${aws_sqs_queue.sqs_error_queue.arn}\",\"maxReceiveCount\":${var.redrive_policy_retry_count}}"
   tags = {
     Domain          = "${var.tags_domain}"
     "Business Unit" = "${var.tags_business_unit}"
-    Environment = "${var.environment}"
-    "Cost Center" = "${var.tags_cost_center}"
-    Team = "${var.tags_team}"
-    Purpose = "${var.tags_purpose}"
-    Description = "${var.description}"
+    Environment     = "${var.environment}"
+    "Cost Center"   = "${var.tags_cost_center}"
+    Team            = "${var.tags_team}"
+    Purpose         = "${var.tags_purpose}"
+    Description     = "${var.description}"
   }
 }
 
 resource "aws_sqs_queue_policy" "sqs_sns_policy" {
   queue_url = "${aws_sqs_queue.sqs_queue.id}"
-  policy = <<POLICY
+  policy    = <<POLICY
 {
   "Version": "2012-10-17",
   "Id": "sqspolicy",
@@ -52,6 +52,6 @@ POLICY
 }
 
 resource "aws_sqs_queue" "sqs_error_queue" {
-  name                      = "${var.app_name}-ERROR"
+  name = "${var.app_name}-ERROR"
   message_retention_seconds = 1209600
-}
\ No newline at end of file
+}
diff --git a/apps/sqs_consume_sns/variables.tf b/apps/sqs_consume_sns/variables.tf
index 8159586d..1f49e118 100644
--- a/apps/sqs_consume_sns/variables.tf
+++ b/apps/sqs_consume_sns/variables.tf
@@ -15,7 +15,7 @@ variable "app_name" {}
 variable "environment" {}
 
 variable "iam_policy_document" {
-  default =<<EOF
+  default = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -98,4 +98,4 @@ variable "visibility_timeout_seconds" {
 
 variable "sns_subscription_filters" {
   default = ""
-}
\ No newline at end of file
+}
diff --git a/apps/sqs_queue/cloudwatch.tf b/apps/sqs_queue/cloudwatch.tf
index e9599bfb..b3ff0bd7 100644
--- a/apps/sqs_queue/cloudwatch.tf
+++ b/apps/sqs_queue/cloudwatch.tf
@@ -1,15 +1,15 @@
 resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_1" {
-  alarm_name                = "${var.queue_name}-STALE-MESSAGES-ALARM-1"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateAgeOfOldestMessage"
-  namespace                 = "AWS/SQS"
-  period                    = "900"  // 15 minutes
-  statistic                 = "Maximum"
-  threshold                 = "3600" // 1 hour
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.sns_alert_arn}"]
-  count                     = "${var.add_stale_message_cloudwatch}"
+  alarm_name          = "${var.queue_name}-STALE-MESSAGES-ALARM-1"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateAgeOfOldestMessage"
+  namespace           = "AWS/SQS"
+  period              = "900" // 15 minutes
+  statistic           = "Maximum"
+  threshold           = "3600" // 1 hour
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.sns_alert_arn}"]
+  count               = "${var.add_stale_message_cloudwatch}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_queue.name}"
   }
@@ -17,17 +17,17 @@ resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_1" {
 }
 
 resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_2" {
-  alarm_name                = "${var.queue_name}-STALE-MESSAGES-ALARM-2"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateAgeOfOldestMessage"
-  namespace                 = "AWS/SQS"
-  period                    = "10800" // 3 hours
-  statistic                 = "Maximum"
-  threshold                 = "86400" // 1 day
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.sns_alert_arn}"]
-  count                     = "${var.add_stale_message_cloudwatch}"
+  alarm_name          = "${var.queue_name}-STALE-MESSAGES-ALARM-2"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateAgeOfOldestMessage"
+  namespace           = "AWS/SQS"
+  period              = "10800" // 3 hours
+  statistic           = "Maximum"
+  threshold           = "86400" // 1 day
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.sns_alert_arn}"]
+  count               = "${var.add_stale_message_cloudwatch}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_queue.name}"
   }
@@ -35,17 +35,17 @@ resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_2" {
 }
 
 resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_3" {
-  alarm_name                = "${var.queue_name}-STALE-MESSAGES-ALARM-3"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateAgeOfOldestMessage"
-  namespace                 = "AWS/SQS"
-  period                    = "86400"  // 1 day
-  statistic                 = "Maximum"
-  threshold                 = "259200" // 3 days
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.sns_alert_arn}"]
-  count                     = "${var.add_stale_message_cloudwatch}"
+  alarm_name          = "${var.queue_name}-STALE-MESSAGES-ALARM-3"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateAgeOfOldestMessage"
+  namespace           = "AWS/SQS"
+  period              = "86400" // 1 day
+  statistic           = "Maximum"
+  threshold           = "259200" // 3 days
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.sns_alert_arn}"]
+  count               = "${var.add_stale_message_cloudwatch}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_queue.name}"
   }
@@ -53,18 +53,18 @@ resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_3" {
 }
 
 resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_1" {
-  alarm_name                = "${var.queue_name}-ERROR-MESSAGES-ALARM-1"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateAgeOfOldestMessage"
-  namespace                 = "AWS/SQS"
-  period                    = "60"  // 1 minute
-  statistic                 = "Minimum"
-  threshold                 = "60" // 1 minute
-  treat_missing_data        = "notBreaching"
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.sns_alert_arn}"]
-  count                     = "${var.add_error_messages_cloudwatch}"
+  alarm_name          = "${var.queue_name}-ERROR-MESSAGES-ALARM-1"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateAgeOfOldestMessage"
+  namespace           = "AWS/SQS"
+  period              = "60" // 1 minute
+  statistic           = "Minimum"
+  threshold           = "60" // 1 minute
+  treat_missing_data  = "notBreaching"
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.sns_alert_arn}"]
+  count               = "${var.add_error_messages_cloudwatch}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_error_queue.name}"
   }
@@ -72,18 +72,18 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_1" {
 }
 
 resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_2" {
-  alarm_name                = "${var.queue_name}-ERROR-MESSAGES-ALARM-2"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateAgeOfOldestMessage"
-  namespace                 = "AWS/SQS"
-  period                    = "3600"  // 1 hour
-  statistic                 = "Maximum"
-  threshold                 = "3600" // 1 hour
-  treat_missing_data        = "notBreaching"
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.sns_alert_arn}"]
-  count                     = "${var.add_error_messages_cloudwatch}"
+  alarm_name          = "${var.queue_name}-ERROR-MESSAGES-ALARM-2"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateAgeOfOldestMessage"
+  namespace           = "AWS/SQS"
+  period              = "3600" // 1 hour
+  statistic           = "Maximum"
+  threshold           = "3600" // 1 hour
+  treat_missing_data  = "notBreaching"
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.sns_alert_arn}"]
+  count               = "${var.add_error_messages_cloudwatch}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_error_queue.name}"
   }
@@ -91,18 +91,18 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_2" {
 }
 
 resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_3" {
-  alarm_name                = "${var.queue_name}-ERROR-MESSAGES-ALARM-3"
-  comparison_operator       = "GreaterThanOrEqualToThreshold"
-  evaluation_periods        = "1"
-  metric_name               = "ApproximateNumberOfMessagesVisible"
-  namespace                 = "AWS/SQS"
-  period                    = "900"  // 15 minutes
-  statistic                 = "Maximum"
-  threshold                 = "10" // 1 hour
-  treat_missing_data        = "notBreaching"
-  datapoints_to_alarm       = "1"
-  alarm_actions             = ["${var.sns_alert_arn}"]
-  count                     = "${var.add_error_messages_cloudwatch}"
+  alarm_name          = "${var.queue_name}-ERROR-MESSAGES-ALARM-3"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods  = "1"
+  metric_name         = "ApproximateNumberOfMessagesVisible"
+  namespace           = "AWS/SQS"
+  period              = "900" // 15 minutes
+  statistic           = "Maximum"
+  threshold           = "10" // 1 hour
+  treat_missing_data  = "notBreaching"
+  datapoints_to_alarm = "1"
+  alarm_actions       = ["${var.sns_alert_arn}"]
+  count               = "${var.add_error_messages_cloudwatch}"
   dimensions {
     QueueName = "${aws_sqs_queue.sqs_error_queue.name}"
   }
diff --git a/apps/sqs_queue/locals.tf b/apps/sqs_queue/locals.tf
index f22b1ed0..098330d9 100644
--- a/apps/sqs_queue/locals.tf
+++ b/apps/sqs_queue/locals.tf
@@ -9,4 +9,4 @@ locals {
     Description     = "${var.description}"
     Environment     = "${var.environment}"
   }
-}
\ No newline at end of file
+}
diff --git a/apps/sqs_queue/main.tf b/apps/sqs_queue/main.tf
index 6cdeb84c..b21d3b6a 100644
--- a/apps/sqs_queue/main.tf
+++ b/apps/sqs_queue/main.tf
@@ -1,9 +1 @@
-provider "aws" {
-}
-
-module "aws_core_data" {
-  source = "../../data_providers/aws_account_core_data"
-  providers = {
-   aws = "aws"
-  } 
-}
\ No newline at end of file
+provider "aws" {}
diff --git a/apps/sqs_queue/sqs.tf b/apps/sqs_queue/sqs.tf
index f39af1e0..e838fdb8 100644
--- a/apps/sqs_queue/sqs.tf
+++ b/apps/sqs_queue/sqs.tf
@@ -1,23 +1,23 @@
 resource "aws_sqs_queue" "sqs_queue" {
-  name                      = "${var.queue_name}"
-  message_retention_seconds = "${var.message_retention_seconds}"
-  receive_wait_time_seconds = "${var.receive_wait_time_seconds}"
+  name                       = "${var.queue_name}"
+  message_retention_seconds  = "${var.message_retention_seconds}"
+  receive_wait_time_seconds  = "${var.receive_wait_time_seconds}"
   visibility_timeout_seconds = "${var.visibility_timeout_seconds}"
-  redrive_policy            = "{\"deadLetterTargetArn\":\"${aws_sqs_queue.sqs_error_queue.arn}\",\"maxReceiveCount\":${var.redrive_policy_retry_count}}"  
+  redrive_policy             = "{\"deadLetterTargetArn\":\"${aws_sqs_queue.sqs_error_queue.arn}\",\"maxReceiveCount\":${var.redrive_policy_retry_count}}"
   tags = {
     Domain          = "${var.tags_domain}"
     "Business Unit" = "${var.tags_business_unit}"
-    Environment = "${var.environment}"
-    "Cost Center" = "${var.tags_cost_center}"
-    Team = "${var.tags_team}"
-    Purpose = "${var.tags_purpose}"
-    Description = "${var.description}"
+    Environment     = "${var.environment}"
+    "Cost Center"   = "${var.tags_cost_center}"
+    Team            = "${var.tags_team}"
+    Purpose         = "${var.tags_purpose}"
+    Description     = "${var.description}"
   }
 }
 
 resource "aws_sqs_queue_policy" "sqs_sns_policy" {
   queue_url = "${aws_sqs_queue.sqs_queue.id}"
-  policy = <<POLICY
+  policy    = <<POLICY
 {
   "Version": "2012-10-17",
   "Id": "${var.queue_name}-policy",
@@ -40,6 +40,6 @@ POLICY
 }
 
 resource "aws_sqs_queue" "sqs_error_queue" {
-  name                      = "${var.queue_name}-ERROR"
+  name = "${var.queue_name}-ERROR"
   message_retention_seconds = 1209600
-}
\ No newline at end of file
+}
diff --git a/apps/vpc_peering/README.md b/apps/vpc_peering/README.md
index 4e5b233a..3ae76d15 100644
--- a/apps/vpc_peering/README.md
+++ b/apps/vpc_peering/README.md
@@ -1,5 +1,6 @@
 <h1>USAGE:</h1>
 Module will peer the "Main" VPC from the source account with the target "Main" VPC.  
+This module will not work with the Shared VPCs
  
 <h2>Required Parameters:</h2>
 These must be set in your call to this module:
diff --git a/apps/vpc_peering/main.tf b/apps/vpc_peering/main.tf
index 7e29a4fd..f8b71d4e 100644
--- a/apps/vpc_peering/main.tf
+++ b/apps/vpc_peering/main.tf
@@ -1,27 +1,14 @@
 # Data sources
 module "local_data" {
-  //source = "git@github.com:albumprinter/eops_tf_modules.git//data_providers/local-get-data"
   source = "../../data_providers/local-get-data"
 
   # See repo for possible outputs
 }
 
-//data "aws_caller_identity" "current" {}
-
-//data "terraform_remote_state" "terraform-ap" {
-//  backend = "s3"
-//
-//  config {
-//    bucket = "${var.tf-remote-state-bucket-name}"
-//    key    = "${data.aws_caller_identity.current.account_id}/vpcPeering_DB-ecom1/terraform.tfstate"
-//    region = "eu-west-1"
-//    acl    = "bucket-owner-full-control"
-//  }
-//}
 
 provider "aws" {
-  region = "eu-west-1"
-  alias = "source_provider"
+  region  = "eu-west-1"
+  alias   = "source_provider"
   version = "~> 0.1"
   assume_role {
     role_arn = "arn:aws:iam::${var.peer_source_account_id}:role/main_provisioner"
@@ -40,8 +27,8 @@ data "aws_caller_identity" "source_account" {
 }
 
 provider "aws" {
-  region = "eu-west-1"
-  alias = "target_provider"
+  region  = "eu-west-1"
+  alias   = "target_provider"
   version = "~> 0.1"
   assume_role {
     role_arn = "arn:aws:iam::${var.peer_target_account_id}:role/main_provisioner"
diff --git a/data_providers/shared-vpc-data/data.tf b/data_providers/shared-vpc-data/data.tf
index 6c3193d2..0f92feb8 100644
--- a/data_providers/shared-vpc-data/data.tf
+++ b/data_providers/shared-vpc-data/data.tf
@@ -33,3 +33,9 @@ data "aws_subnet" "private" {
   count = "${length(data.aws_subnet_ids.private.ids)}"
   id    = "${data.aws_subnet_ids.private.ids[count.index]}"
 }
+data "aws_caller_identity" "current" {}
+data "aws_availability_zones" "available" {}
+
+data "aws_vpc_endpoint_service" "s3" {
+  service = "s3"
+}
diff --git a/data_providers/shared-vpc-data/outputs.tf b/data_providers/shared-vpc-data/outputs.tf
index 12d36326..5ef2cfe1 100644
--- a/data_providers/shared-vpc-data/outputs.tf
+++ b/data_providers/shared-vpc-data/outputs.tf
@@ -13,3 +13,18 @@ output "public_subnet_ids" {
 output "private_subnet_ids" {
   value = ["${data.aws_subnet_ids.private.ids}"]
 }
+output "account_id" {
+  value = "${data.aws_caller_identity.current.account_id}"
+}
+
+output "availability_zones" {
+  value = "${data.aws_availability_zones.available.names}"
+}
+
+output "public_subnets" {
+  value = "${data.aws_subnet_ids.public.ids}"
+}
+
+output "private_subnets" {
+  value = "${data.aws_subnet_ids.private.ids}"
+}