diff --git a/availabilty_zones.tf b/availabilty_zones.tf
index fdf50d3..0684edb 100644
--- a/availabilty_zones.tf
+++ b/availabilty_zones.tf
@@ -1,30 +1,25 @@
-# locals {
-#   az_list       = data.aws_availability_zones.zones.names
-#   az_count      = length(local.az_list)
-#   az_count_list = range(local.az_count)
-# }
-
 data "aws_availability_zones" "zones" {
   state = "available"
 }
 
 data "aws_availability_zone" "zone" {
-  count = length(data.aws_availability_zones.zones.names)
-  state = "available"
-  name  = data.aws_availability_zones.zones.names[count.index]
+  for_each = toset(data.aws_availability_zones.zones.names)
+  state    = "available"
+  name     = each.key
 }
 
+
 output "availability_zone_names" {
-  description = "VPC Availability zone name list (3)"
+  description = "VPC Availability zone name list"
   value       = data.aws_availability_zones.zones.names
 }
 
 output "availability_zone_ids" {
-  description = "VPC Availability zone id list (3)"
+  description = "VPC Availability zone id list"
   value       = data.aws_availability_zones.zones.zone_ids
 }
 
 output "availability_zone_suffixes" {
-  description = "VPC Availability zone suffix list (3)"
-  value       = data.aws_availability_zone.zone[*].name_suffix
+  description = "VPC Availability zone suffix list"
+  value       = [for k, v in data.aws_availability_zone.zone : v.name_suffix]
 }