diff --git a/.travis.yml b/.travis.yml
index adbca21..45da156 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: go
 go:
   - 1.5
   - 1.6
+  - 1.7
   - tip
 
 install: go install github.com/DATA-DOG/godog/cmd/godog
diff --git a/fmt.go b/fmt.go
index ce062df..2b5d9af 100644
--- a/fmt.go
+++ b/fmt.go
@@ -15,8 +15,6 @@ import (
 
 // some snippet formatting regexps
 var snippetExprCleanup = regexp.MustCompile("([\\/\\[\\]\\(\\)\\\\^\\$\\.\\|\\?\\*\\+\\'])")
-
-// var snippetExprQuoted = regexp.MustCompile("(\\s*|^)\"(?:[^\"]*)\"(\\s+|,|:|\\.|$)")
 var snippetExprQuoted = regexp.MustCompile("(\\W|^)\"(?:[^\"]*)\"(\\W|$)")
 var snippetMethodName = regexp.MustCompile("[^a-zA-Z\\_\\ ]")
 var snippetNumbers = regexp.MustCompile("(\\d+)")