diff --git a/goreleaserlib/goreleaser.go b/goreleaserlib/goreleaser.go
index 0eb52223e..b856eb39a 100644
--- a/goreleaserlib/goreleaser.go
+++ b/goreleaserlib/goreleaser.go
@@ -8,6 +8,8 @@ import (
 
 	"github.com/apex/log"
 	"github.com/apex/log/handlers/cli"
+	yaml "gopkg.in/yaml.v2"
+
 	"github.com/goreleaser/goreleaser/config"
 	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/pipeline"
@@ -27,7 +29,6 @@ import (
 	"github.com/goreleaser/goreleaser/pipeline/release"
 	"github.com/goreleaser/goreleaser/pipeline/sign"
 	"github.com/goreleaser/goreleaser/pipeline/snapcraft"
-	yaml "gopkg.in/yaml.v2"
 )
 
 var (
diff --git a/internal/archiveformat/format.go b/internal/archiveformat/format.go
index ce87f215a..564ea5094 100644
--- a/internal/archiveformat/format.go
+++ b/internal/archiveformat/format.go
@@ -1,5 +1,6 @@
 // Package archiveformat provides functions to get the format of given package
 // based on the config
+// TODO: this can be moved inside the archive pipe package
 package archiveformat
 
 import (
diff --git a/pipeline/artifactory/artifactory_test.go b/pipeline/artifactory/artifactory_test.go
index 91b6a27a2..52dfafa08 100644
--- a/pipeline/artifactory/artifactory_test.go
+++ b/pipeline/artifactory/artifactory_test.go
@@ -13,7 +13,6 @@ import (
 	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
 	"github.com/goreleaser/goreleaser/pipeline"
-
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pipeline/changelog/changelog_test.go b/pipeline/changelog/changelog_test.go
index 5cf58fd90..76f7bd782 100644
--- a/pipeline/changelog/changelog_test.go
+++ b/pipeline/changelog/changelog_test.go
@@ -7,7 +7,6 @@ import (
 	"github.com/goreleaser/goreleaser/config"
 	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/testlib"
-
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pipeline/default.go b/pipeline/defaulter.go
similarity index 100%
rename from pipeline/default.go
rename to pipeline/defaulter.go
diff --git a/pipeline/doc.go b/pipeline/doc.go
new file mode 100644
index 000000000..9f32a880d
--- /dev/null
+++ b/pipeline/doc.go
@@ -0,0 +1,3 @@
+// Package pipeline provides the generic piper and defaulter interfaces,
+// which should be implemented add new pipes to goreleaser..
+package pipeline
diff --git a/pipeline/git/doc.go b/pipeline/git/doc.go
new file mode 100644
index 000000000..138e84cfd
--- /dev/null
+++ b/pipeline/git/doc.go
@@ -0,0 +1,3 @@
+// Package git implements the Pipe interface getting and validating the
+// current git repository state
+package git
diff --git a/pipeline/git/git.go b/pipeline/git/git.go
index ce514099c..19d9bad08 100644
--- a/pipeline/git/git.go
+++ b/pipeline/git/git.go
@@ -1,5 +1,3 @@
-// Package git implements the Pipe interface getting and validating the
-// current git repository state
 package git
 
 import (
diff --git a/pipeline/piper.go b/pipeline/piper.go
index 767250b50..ff4028515 100644
--- a/pipeline/piper.go
+++ b/pipeline/piper.go
@@ -1,4 +1,3 @@
-// Package pipeline provides a generic pipe interface.
 package pipeline
 
 import (
diff --git a/pipeline/release/remote_test.go b/pipeline/release/remote_test.go
index 39fdf46b7..6c04f1d2b 100644
--- a/pipeline/release/remote_test.go
+++ b/pipeline/release/remote_test.go
@@ -4,7 +4,6 @@ import (
 	"testing"
 
 	"github.com/goreleaser/goreleaser/internal/testlib"
-
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pipeline/sign/sign_test.go b/pipeline/sign/sign_test.go
index 11df3f75b..c5ae034a9 100644
--- a/pipeline/sign/sign_test.go
+++ b/pipeline/sign/sign_test.go
@@ -12,7 +12,6 @@ import (
 	"github.com/goreleaser/goreleaser/config"
 	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
-
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pipeline/snapcraft/snapcraft.go b/pipeline/snapcraft/snapcraft.go
index ebfbd11ac..6bb29c239 100644
--- a/pipeline/snapcraft/snapcraft.go
+++ b/pipeline/snapcraft/snapcraft.go
@@ -9,15 +9,15 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"github.com/goreleaser/goreleaser/internal/artifact"
-	"github.com/goreleaser/goreleaser/internal/nametemplate"
-
 	"github.com/apex/log"
-	"github.com/goreleaser/goreleaser/context"
-	"github.com/goreleaser/goreleaser/internal/linux"
-	"github.com/goreleaser/goreleaser/pipeline"
 	"golang.org/x/sync/errgroup"
 	yaml "gopkg.in/yaml.v2"
+
+	"github.com/goreleaser/goreleaser/context"
+	"github.com/goreleaser/goreleaser/internal/artifact"
+	"github.com/goreleaser/goreleaser/internal/linux"
+	"github.com/goreleaser/goreleaser/internal/nametemplate"
+	"github.com/goreleaser/goreleaser/pipeline"
 )
 
 // ErrNoSnapcraft is shown when snapcraft cannot be found in $PATH