diff --git a/core/dns.go b/core/dns.go
index 4035ef11f..9ba05158e 100644
--- a/core/dns.go
+++ b/core/dns.go
@@ -15,7 +15,7 @@ import (
 )
 
 const (
-	// No filter is used to tell LookupHost to query both A and AAAA records
+	// NoFilter is used to tell LookupHost to query both A and AAAA records
 	NoFilter = iota
 	// IPv4OnlyFilter is used to tell LookupHost to only query A records
 	IPv4OnlyFilter
diff --git a/va/validation-authority.go b/va/validation-authority.go
index fa443e746..5ddc932ce 100644
--- a/va/validation-authority.go
+++ b/va/validation-authority.go
@@ -64,7 +64,6 @@ type verificationRequestEvent struct {
 }
 
 func verifyValidationJWS(validation *jose.JsonWebSignature, accountKey *jose.JsonWebKey, target map[string]interface{}) error {
-
 	if len(validation.Signatures) > 1 {
 		return fmt.Errorf("Too many signatures on validation JWS")
 	}
@@ -99,8 +98,6 @@ func verifyValidationJWS(validation *jose.JsonWebSignature, accountKey *jose.Jso
 	return nil
 }
 
-// Validation methods
-
 // problemDetailsFromDNSError checks the error returned from Lookup...
 // methods and tests if the error was an underlying net.OpError or an error
 // caused by resolver returning SERVFAIL or other invalid Rcodes and returns
@@ -155,6 +152,8 @@ func (va ValidationAuthorityImpl) resolvingDialer(name string, scheme string) (f
 	}, addr, nil
 }
 
+// Validation methods
+
 func (va ValidationAuthorityImpl) validateSimpleHTTP(identifier core.AcmeIdentifier, input core.Challenge, accountKey jose.JsonWebKey) (core.Challenge, error) {
 	challenge := input