diff --git a/nginx.tmpl b/nginx.tmpl
index cbe5fe8..fa2a7cb 100644
--- a/nginx.tmpl
+++ b/nginx.tmpl
@@ -32,9 +32,7 @@ server {
 
 {{ range $host, $containers := groupByMulti $ "Env.VIRTUAL_HOST" "," }}
 upstream {{ $host }} {
-
-{{ range $index, $container := $containers }}
-
+{{ range $container := $containers }}
 	{{ $addrLen := len $container.Addresses }}
 	{{/* If only 1 port exposed, use that */}}
 	{{ if eq $addrLen 1 }}
@@ -42,19 +40,17 @@ upstream {{ $host }} {
 		   # {{$container.Name}}
 		   server {{ $address.IP }}:{{ $address.Port }};
 		{{ end }}
-
 	{{/* If more than one port exposed, use the one matching VIRTUAL_PORT env var */}}
 	{{ else if $container.Env.VIRTUAL_PORT }}
-		{{ range $index, $address := $container.Addresses }}
+		{{ range $address := .Addresses }}
 		   {{ if eq $address.Port $container.Env.VIRTUAL_PORT }}
 		   # {{$container.Name}}
 		   server {{ $address.IP }}:{{ $address.Port }};
 		   {{ end }}
 		{{ end }}
-
 	{{/* Else default to standard web port 80 */}}
 	{{ else }}
-		{{ range $index, $address := $container.Addresses }}
+		{{ range $address := $container.Addresses }}
 			{{ if eq $address.Port "80" }}
 			# {{$container.Name}}
 			server {{ $address.IP }}:{{ $address.Port }};