diff --git a/codedeploy.tf b/codedeploy.tf
index d50e5ef..378a193 100644
--- a/codedeploy.tf
+++ b/codedeploy.tf
@@ -5,13 +5,13 @@ resource "aws_codedeploy_app" "main" {
 
 # create a deployment group
 resource "aws_codedeploy_deployment_group" "main" {
-  app_name              = "${aws_codedeploy_app.main.name}"
+  app_name              = aws_codedeploy_app.main.name
   deployment_group_name = "Sample_DepGroup"
-  service_role_arn      = "${aws_iam_role.codedeploy_service.arn}"
+  service_role_arn      = aws_iam_role.codedeploy_service.arn
 
   deployment_config_name = "CodeDeployDefault.OneAtATime" # AWS defined deployment config
 
-  ec2_tag_filter = {
+  ec2_tag_filter {
     key   = "Name"
     type  = "KEY_AND_VALUE"
     value = "CodeDeployDemo"
diff --git a/key_pair.tf b/key_pair.tf
index 3516214..9cd6a16 100644
--- a/key_pair.tf
+++ b/key_pair.tf
@@ -1,4 +1,4 @@
 resource "aws_key_pair" "main" {
   key_name   = "code-deploy-demo"
-  public_key = "${file(var.public_key_path)}"
+  public_key = file(var.public_key_path)
 }
diff --git a/main.tf b/main.tf
index 42c3cf6..c122a6f 100644
--- a/main.tf
+++ b/main.tf
@@ -4,4 +4,5 @@ data "aws_ami" "amzn-linux" {
     name = "name"
     values = ["amzn-ami-*-x86_64-gp2"]
   }
+  owners = ["amazon"]
 }
diff --git a/outputs.tf b/outputs.tf
index 2ce1f1c..e19b847 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -1,7 +1,7 @@
 output bucket_name {
-  value = "${aws_s3_bucket.b.bucket_domain_name}"
+  value = aws_s3_bucket.b.bucket_domain_name
 }
 
 output instance_ip {
-  value = "${aws_instance.main.public_ip}"
+  value = aws_instance.main.public_ip
 }
diff --git a/providers.tf b/providers.tf
index a062bce..a2e6a49 100644
--- a/providers.tf
+++ b/providers.tf
@@ -1,5 +1,5 @@
 provider aws {
-  region = "${var.region}"
+  region = var.region
 }
 
 provider random {}
diff --git a/roles.tf b/roles.tf
index a35b591..d36865e 100644
--- a/roles.tf
+++ b/roles.tf
@@ -24,7 +24,7 @@ EOF
 # attach AWS managed policy called AWSCodeDeployRole
 # required for deployments which are to an EC2 compute platform
 resource "aws_iam_role_policy_attachment" "codedeploy_service" {
-  role       = "${aws_iam_role.codedeploy_service.name}"
+  role       = aws_iam_role.codedeploy_service.name
   policy_arn = "arn:aws:iam::aws:policy/service-role/AWSCodeDeployRole"
 }
 
@@ -53,11 +53,11 @@ EOF
 
 # provide ec2 access to s3 bucket to download revision. This role is needed by the CodeDeploy agent on EC2 instances.
 resource "aws_iam_role_policy_attachment" "instance_profile_codedeploy" {
-  role       = "${aws_iam_role.instance_profile.name}"
+  role       = aws_iam_role.instance_profile.name
   policy_arn = "arn:aws:iam::aws:policy/service-role/AmazonEC2RoleforAWSCodeDeploy"
 }
 
 resource "aws_iam_instance_profile" "main" {
   name = "codedeploy-instance-profile"
-  role = "${aws_iam_role.instance_profile.name}"
+  role = aws_iam_role.instance_profile.name
 }