diff --git a/go.mod b/go.mod
index 319dd45..4ca3012 100644
--- a/go.mod
+++ b/go.mod
@@ -35,16 +35,18 @@ require (
 	willnorris.com/go/gifresize v1.0.0
 )
 
-// temporary fix to https://github.com/golang/lint/issues/436 which still seems to be a problem
-replace github.com/golang/lint => github.com/golang/lint v0.0.0-20181217174547-8f45f776aaf1
+replace (
+	// replace git.apache.org with github.com/apache (which is the upstream master
+	// anyway), since git.apache.org is offline. v0.12.0 is the latest release, but
+	// go complains about "github.com/apache/thrift@v0.12.0 used for two different
+	// module paths".  Instead we move one commit ahead.
+	git.apache.org/thrift.git => github.com/apache/thrift v0.12.1-0.20190107215100-e824efcb7935
 
-// local copy of envy package without cobra support
-replace github.com/jamiealquiza/envy => ./third_party/envy
+	// temporary fix to https://github.com/golang/lint/issues/436 which still seems to be a problem
+	github.com/golang/lint => github.com/golang/lint v0.0.0-20181217174547-8f45f776aaf1
 
-// replace git.apache.org with github.com/apache (which is the upstream master
-// anyway), since git.apache.org is offline. v0.12.0 is the latest release, but
-// go complains about "github.com/apache/thrift@v0.12.0 used for two different
-// module paths".  Instead we move one commit ahead.
-replace git.apache.org/thrift.git => github.com/apache/thrift v0.12.1-0.20190107215100-e824efcb7935
+	// local copy of envy package without cobra support
+	github.com/jamiealquiza/envy => ./third_party/envy
+)
 
 go 1.13