diff --git a/__template__/environments/api/main.tf b/__template__/environments/api/main.tf
index 82e8e3c..4db097a 100644
--- a/__template__/environments/api/main.tf
+++ b/__template__/environments/api/main.tf
@@ -1,5 +1,6 @@
 terraform {
   required_version = ">= 0.12.0"
+
   backend "s3" {
     bucket         = "terraform-state-"
     key            = "api/terraform.tfstate"
@@ -11,8 +12,9 @@ terraform {
 
 variable "workspace_iam_roles" {
   type = "map"
+
   default = {
-    devemopment = "arn:aws:iam::DEVELOPMENT-ACCOUNT-ID:role/Terraform"
+    development = "arn:aws:iam::DEVELOPMENT-ACCOUNT-ID:role/Terraform"
     testing     = "arn:aws:iam::TESTING-ACCOUNT-ID:role/Terraform"
     staging     = "arn:aws:iam::STAGING-ACCOUNT-ID:role/Terraform"
     production  = "arn:aws:iam::PRODUCTION-ACCOUNT-ID:role/Terraform"
@@ -20,15 +22,15 @@ variable "workspace_iam_roles" {
 }
 
 provider "aws" {
-  region  = "${var.aws_region}"
-  profile = "${var.profile}"
+  region      = "${var.aws_region}"
+  profile     = "${var.profile}"
   assume_role = "${var.workspace_iam_roles[terraform.workspace]}"
 }
 
 provider "aws" {
-  region  = "us-east-1"
-  profile = "${var.profile}"
-  alias   = "edge"
+  region      = "us-east-1"
+  profile     = "${var.profile}"
+  alias       = "edge"
   assume_role = "${var.workspace_iam_roles[terraform.workspace]}"
 }
 
@@ -45,3 +47,4 @@ data "terraform_remote_state" "vpc" {
 }
 
 ## API
+
diff --git a/master-account/accounts.tf b/master-account/accounts.tf
index 01da967..fa1347c 100644
--- a/master-account/accounts.tf
+++ b/master-account/accounts.tf
@@ -8,22 +8,20 @@
 // |  |- development
 // |  |- forensics
 
-
-
 // TODO loop over local.subaccounts
 // Docs: https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_create.html
 // To set password go to root sign up and enter email
 resource "aws_organizations_account" "main" {
-  count                      = "${length(var.sub_accounts)}"
-  name                       = "${var.sub_accounts[count.index]}"
-  email                      = "${local.account_email_local_part}+${var.sub_accounts[count.index]}@${local.account_email_domain}"
-  iam_user_access_to_billing = "DENY"
+  count = "${length(var.sub_accounts)}"
+  name  = "${var.sub_accounts[count.index]}"
+  email = "${local.account_email_local_part}+${var.sub_accounts[count.index]}@${local.account_email_domain}"
+
+  #iam_user_access_to_billing = "DENY"
 }
 
 # Org Units - TODO https://github.com/terraform-providers/terraform-provider-aws/pull/4207
 
 
-
 // https://www.terraform.io/docs/providers/aws/r/organizations_policy_attachment.html
 //resource "aws_organizations_policy_attachment" "environments" {
 //  policy_id = "${aws_organizations_policy.environments.id}"
@@ -44,3 +42,4 @@ resource "aws_organizations_account" "main" {
 //}
 //POLICY
 //}
+
diff --git a/master-account/main.tf b/master-account/main.tf
index e54eca5..6c1ff06 100644
--- a/master-account/main.tf
+++ b/master-account/main.tf
@@ -1,10 +1,8 @@
-
-resource "aws_organizations_organization" "account" {
-  feature_set = "ALL"
-}
+# resource "aws_organizations_organization" "account" {
+#   feature_set = "ALL"
+# }
 
 resource "aws_iam_account_alias" "alias" {
-  count = "${var.account_alias == "" ? 0 : 1}"
+  count         = "${var.account_alias == "" ? 0 : 1}"
   account_alias = "${var.account_alias}"
 }
-