diff --git a/encrypt.go b/encrypt.go
index eea5faf..2d0ebc5 100644
--- a/encrypt.go
+++ b/encrypt.go
@@ -13,11 +13,11 @@ import (
 
 type encryptWriter struct {
 	multipart *multipart.Writer
-	armored io.WriteCloser
+	armored   io.WriteCloser
 	cleartext io.WriteCloser
 
-	h textproto.MIMEHeader
-	to []*openpgp.Entity
+	h      textproto.MIMEHeader
+	to     []*openpgp.Entity
 	signed *openpgp.Entity
 	config *packet.Config
 }
@@ -95,8 +95,8 @@ func Encrypt(w io.Writer, h textproto.MIMEHeader, to []*openpgp.Entity, signed *
 	return &encryptWriter{
 		multipart: multipart.NewWriter(w),
 
-		h: h,
-		to: to,
+		h:      h,
+		to:     to,
 		signed: signed,
 		config: config,
 	}
diff --git a/example_test.go b/example_test.go
index a039e4c..5138a84 100644
--- a/example_test.go
+++ b/example_test.go
@@ -27,7 +27,7 @@ func ExampleEncrypt() {
 	th.SetContentType("text/plain", nil)
 
 	// Create a new PGP/MIME writer
-	var ciphertext struct{*message.Writer}
+	var ciphertext struct{ *message.Writer }
 	cleartext := pgpmime.Encrypt(&ciphertext, textproto.MIMEHeader(th.Header), to, nil, nil)
 
 	// Add the PGP/MIME Content-Type header field to the mail header
@@ -73,7 +73,7 @@ func ExampleSign() {
 	bh := mail.NewTextHeader()
 	bh.SetContentType("text/plain", nil)
 
-	var signed struct{*message.Writer}
+	var signed struct{ *message.Writer }
 	body := pgpmime.Sign(&signed, textproto.MIMEHeader(bh.Header), e, nil)
 
 	mh.Set("Content-Type", body.ContentType())
diff --git a/sign.go b/sign.go
index 54fc979..f39fcdf 100644
--- a/sign.go
+++ b/sign.go
@@ -2,11 +2,11 @@ package pgpmime
 
 import (
 	"bytes"
+	"crypto"
 	"io"
 	"mime"
 	"mime/multipart"
 	"net/textproto"
-	"crypto"
 
 	"golang.org/x/crypto/openpgp"
 	"golang.org/x/crypto/openpgp/packet"
@@ -35,10 +35,10 @@ func hashName(h crypto.Hash) string {
 
 type signWriter struct {
 	multipart *multipart.Writer
-	body io.WriteCloser
+	body      io.WriteCloser
 	signature <-chan io.Reader
 
-	h textproto.MIMEHeader
+	h      textproto.MIMEHeader
 	signer *openpgp.Entity
 	config *packet.Config
 }
@@ -59,7 +59,7 @@ func (sw *signWriter) open() error {
 		ch <- &b
 	}()
 
-	sw.body = struct{
+	sw.body = struct {
 		io.Writer
 		io.Closer
 	}{
@@ -108,7 +108,7 @@ func (sw *signWriter) Close() error {
 func (sw *signWriter) ContentType() string {
 	return mime.FormatMediaType("multipart/signed", map[string]string{
 		"boundary": sw.multipart.Boundary(),
-		"micalg": "pgp-" + hashName(sw.config.Hash()),
+		"micalg":   "pgp-" + hashName(sw.config.Hash()),
 		"protocol": "application/pgp-signature",
 	})
 }
@@ -118,7 +118,7 @@ func Sign(w io.Writer, h textproto.MIMEHeader, signer *openpgp.Entity, config *p
 	return &signWriter{
 		multipart: multipart.NewWriter(w),
 
-		h: h,
+		h:      h,
 		signer: signer,
 		config: config,
 	}