Simplify code

exempt_test.go

@@ -118,11 +118,11 @@ func TestExemptRegexpCall(t *testing.T) {
 	re := regexp.MustCompile(pattern)
 	hand.ExemptRegexp(re)
 
-	got_re := hand.exemptRegexps[0]
+	gotRe := hand.exemptRegexps[0]
 
-	if re != got_re {
+	if re != gotRe {
 		t.Errorf("The compiled pattern is not what we gave: expected %v, got %v",
-			re, got_re)
+			re, gotRe)
 	}
 
 }

handler.go

@@ -66,10 +66,8 @@ func defaultFailureHandler(w http.ResponseWriter, r *http.Request) {
 // Extracts the "sent" token from the request
 // and returns an unmasked version of it
 func extractToken(r *http.Request) []byte {
-	var sentToken string
-
 	// Prefer the header over form value
-	sentToken = r.Header.Get(HeaderName)
+	sentToken := r.Header.Get(HeaderName)
 
 	// Then POST values
 	if len(sentToken) == 0 {

token.go

@@ -78,9 +78,8 @@ func verifyToken(realToken, sentToken []byte) bool {
 
 	if realN == tokenLength && sentN == 2*tokenLength {
 		return verifyMasked(realToken, sentToken)
-	} else {
-		return false
 	}
+	return false
 }
 
 // Verifies the masked token

token_test.go

@@ -42,14 +42,14 @@ func TestVerifyTokenChecksLengthCorrectly(t *testing.T) {
 	for i := 0; i < 64; i++ {
 		slice := make([]byte, i)
 		result := verifyToken(slice, slice)
-		if result != false {
+		if result {
 			t.Errorf("VerifyToken should've returned false with slices of length %d", i)
 		}
 	}
 
 	slice := make([]byte, 64)
 	result := verifyToken(slice[:32], slice)
-	if result != true {
+	if !result {
 		t.Errorf("VerifyToken should've returned true on a zeroed slice of length 64")
 	}
 }