diff --git a/directions.go b/directions.go
index a068e0a..e687674 100644
--- a/directions.go
+++ b/directions.go
@@ -121,7 +121,7 @@ func (do *DirectionsOpts) update(p url.Values) {
 	if do.Waypoints != nil {
 		v := ""
 		if do.OptimizeWaypoints {
-			v := "optimize:true|"
+			v = "optimize:true|"
 		}
 		p.Set("waypoints", v+encodeLocations(do.Waypoints))
 	}
diff --git a/maps_test.go b/maps_test.go
index 63140ab..66503d6 100644
--- a/maps_test.go
+++ b/maps_test.go
@@ -165,7 +165,7 @@ func TestDistanceMatrix(t *testing.T) {
 	orig := []Location{Address("Vancouver, BC"), Address("Seattle")}
 	dst := []Location{Address("San Francisco"), Address("Victoria, BC")}
 	opts := &DistanceMatrixOpts{
-		Mode:     String(ModeBicycling),
+		Mode:     ModeBicycling,
 		Language: "fr-FR",
 	}
 	t.Logf("%s", baseURL+distancematrix(orig, dst, opts))