From 451fd8b7796015afbe01cfe9168e4c51e8b40013 Mon Sep 17 00:00:00 2001
From: Raphael Simon <raphael@rightscale.com>
Date: Tue, 27 May 2014 16:37:30 -0700
Subject: [PATCH] Additional code cleanup (see comments on issue #56)

---
 regexp.go | 14 ++++++--------
 route.go  |  8 +++-----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/regexp.go b/regexp.go
index 19a358b..ef1db8f 100644
--- a/regexp.go
+++ b/regexp.go
@@ -249,14 +249,12 @@ func (v *routeRegexpGroup) setMatch(req *http.Request, m *RouteMatch, r *Route)
 		}
 	}
 	// Store query string variables.
-	if v.queries != nil && len(v.queries) > 0 {
-		rawQuery := req.URL.RawQuery
-		for _, q := range v.queries {
-			queryVars := q.regexp.FindStringSubmatch(rawQuery)
-			if queryVars != nil {
-				for k, v := range q.varsN {
-					m.Vars[v] = queryVars[k+1]
-				}
+	rawQuery := req.URL.RawQuery
+	for _, q := range v.queries {
+		queryVars := q.regexp.FindStringSubmatch(rawQuery)
+		if queryVars != nil {
+			for k, v := range q.varsN {
+				m.Vars[v] = queryVars[k+1]
 			}
 		}
 	}
diff --git a/route.go b/route.go
index c70fe60..4fb85f7 100644
--- a/route.go
+++ b/route.go
@@ -152,11 +152,9 @@ func (r *Route) addRegexpMatcher(tpl string, matchHost, matchPrefix, matchQuery
 	if err != nil {
 		return err
 	}
-	if r.regexp.queries != nil {
-		for _, q := range r.regexp.queries {
-			if err = uniqueVars(rr.varsN, q.varsN); err != nil {
-				return err
-			}
+	for _, q := range r.regexp.queries {
+		if err = uniqueVars(rr.varsN, q.varsN); err != nil {
+			return err
 		}
 	}
 	if matchHost {