diff --git a/dnssec.go b/dnssec.go
index 84d22cb3..b6d65f89 100644
--- a/dnssec.go
+++ b/dnssec.go
@@ -165,7 +165,7 @@ func (k *RR_DNSKEY) ToDS(h int) *RR_DS {
 
 	owner := make([]byte, 255)
 	off, err1 := PackDomainName(k.Hdr.Name, owner, 0, nil, false)
-	if err1 != nil  {
+	if err1 != nil {
 		return nil
 	}
 	owner = owner[:off]
@@ -266,7 +266,7 @@ func (rr *RR_RRSIG) Sign(k PrivateKey, rrset []RR) error {
 		h = sha512.New()
 		ch = crypto.SHA512
 	case RSAMD5:
-		fallthrough		// Deprecated in RFC 6725
+		fallthrough // Deprecated in RFC 6725
 	default:
 		return ErrAlg
 	}
diff --git a/parse_test.go b/parse_test.go
index 0945f918..3af01738 100644
--- a/parse_test.go
+++ b/parse_test.go
@@ -621,7 +621,7 @@ func TestSRVPacking(t *testing.T) {
 	}
 
 	_, err := msg.Pack()
-	if err != nil{
+	if err != nil {
 		t.Fatalf("Couldn't pack %v\n", msg)
 	}
 }
diff --git a/tlsa.go b/tlsa.go
index 8e6b3ebb..229209ed 100644
--- a/tlsa.go
+++ b/tlsa.go
@@ -59,7 +59,7 @@ func (r *RR_TLSA) Verify(cert *x509.Certificate) error {
 	if r.Certificate == CertificateToDANE(r.Selector, r.MatchingType, cert) {
 		return nil
 	}
-	return ErrSig	// ErrSig, really?
+	return ErrSig // ErrSig, really?
 }
 
 // TLSAName returns the ownername of a TLSA resource record as per the
diff --git a/tsig.go b/tsig.go
index f54c5faa..8cd056a0 100644
--- a/tsig.go
+++ b/tsig.go
@@ -303,7 +303,7 @@ func stripTsig(msg []byte) ([]byte, *RR_TSIG, error) {
 	rr := new(RR_TSIG)
 	off := 0
 	tsigoff := 0
-	if off, err = UnpackStruct(&dh, msg, off); err !=nil {
+	if off, err = UnpackStruct(&dh, msg, off); err != nil {
 		return nil, nil, err
 	}
 	if dh.Arcount == 0 {