diff --git a/goclean.sh b/goclean.sh
index 91ae7d79..0e779e60 100755
--- a/goclean.sh
+++ b/goclean.sh
@@ -12,8 +12,8 @@
 set -e
 
 # Automatic checks
-test -z "$(gofmt -l -w .     | tee /dev/stderr)"
 test -z "$(gometalinter --disable-all \
+--enable=gofmt \
 --enable=golint \
 --enable=vet \
 --enable=goimports \
diff --git a/infrastructure.go b/infrastructure.go
index 66ca79d6..8f6e2423 100644
--- a/infrastructure.go
+++ b/infrastructure.go
@@ -555,7 +555,7 @@ func (c *Client) reregisterNtfns() error {
 // ignoreResends is a set of all methods for requests that are "long running"
 // are not be reissued by the client on reconnect.
 var ignoreResends = map[string]struct{}{
-	"rescan": struct{}{},
+	"rescan": {},
 }
 
 // resendRequests resends any requests that had not completed when the client