diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80b9e3b9b973e26791509e9522b9c8e8ca4d4018..8caf77e54c0568453ef050d49b9d24760e771630 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,10 +76,10 @@ Code lint:
     - lint
   script:
     - "ln -s $(pwd) $GOPATH/src/dfss"
-    - "go get github.com/alecthomas/gometalinter"
+    - "go get -u github.com/alecthomas/gometalinter"
     - "./build/deps.sh"
     - "cd $GOPATH/src/dfss && make install_all"
-    - "gometalinter --install"
+    - "gometalinter --install --update"
     - "gometalinter -t --deadline=600s -j1 --skip=api --skip=fixtures --skip=gui --skip=dfssd --disable=aligncheck ./..."
 
 Deploy:
diff --git a/dfssc/impexp.go b/dfssc/impexp.go
index 04aff58eec9ef514765c5fa13c3ebc29288ba4f8..da8213445fa532842680d882169b8b7b15750c0f 100644
--- a/dfssc/impexp.go
+++ b/dfssc/impexp.go
@@ -44,12 +44,7 @@ func readPassphrases(keyPassphrase, confPassphrase *string, second bool) error {
 	}
 
 	fmt.Println("Enter the passphrase of your current key (if any)")
-	err = readPassword(keyPassphrase, false)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return readPassword(keyPassphrase, false)
 }
 
 // import the configuration
diff --git a/dfssc/user/authentication.go b/dfssc/user/authentication.go
index d8bd0b49304a7580eceb2494c5a8eb7f970b2cde..bbb55c9d9115b12db4115bacf5a4505d185f4fcd 100644
--- a/dfssc/user/authentication.go
+++ b/dfssc/user/authentication.go
@@ -81,12 +81,7 @@ func (m *AuthManager) Authenticate() error {
 		return err
 	}
 
-	err = m.evaluateResponse(response)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return m.evaluateResponse(response)
 }
 
 // Creates the associated authentication request and sends it to the platform grpc server
@@ -117,10 +112,5 @@ func (m *AuthManager) sendRequest() (*pb.RegisteredUser, error) {
 func (m *AuthManager) evaluateResponse(response *pb.RegisteredUser) error {
 	cert := []byte(response.ClientCert)
 
-	err := ioutil.WriteFile(m.fileCert, cert, 0600)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return ioutil.WriteFile(m.fileCert, cert, 0600)
 }
diff --git a/dfssc/user/client.go b/dfssc/user/client.go
index 00248995f1901953c9c7b2bea3ce4b2d63b1af16..5390d654e6c46365264b2307036231dafbf7b7e9 100644
--- a/dfssc/user/client.go
+++ b/dfssc/user/client.go
@@ -13,13 +13,7 @@ func Register(fileCA, fileCert, fileKey, addrPort, passphrase, country, organiza
 	if err != nil {
 		return err
 	}
-
-	err = manager.GetCertificate()
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return manager.GetCertificate()
 }
 
 // Authenticate a user using the provided parameters
@@ -28,13 +22,7 @@ func Authenticate(fileCA, fileCert, addrPort, mail, token string) error {
 	if err != nil {
 		return err
 	}
-
-	err = manager.Authenticate()
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return manager.Authenticate()
 }
 
 func connect(fileCA, addrPort string) (pb.PlatformClient, error) {
diff --git a/dfssc/user/config.go b/dfssc/user/config.go
index e0dc37e83232c257e36ccb383364d05b38efbbb1..ee0a0196acd3e9771d9cbdec457b82f883a9183e 100644
--- a/dfssc/user/config.go
+++ b/dfssc/user/config.go
@@ -123,11 +123,7 @@ func (c *Config) checkData(keyPassphrase string) error {
 	}
 
 	_, err = auth.EncryptedPEMToPrivateKey(c.KeyData, keyPassphrase)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return err
 }
 
 // SaveUserInformations save the certificate and private key to the files specified in the Config struct
diff --git a/dfssp/authority/rootCA.go b/dfssp/authority/rootCA.go
index 5a9934fb32522d6086853d88a02485267f3229a8..c1ff0dd4150ed6d9183eafd2bd3b78650867f7e7 100644
--- a/dfssp/authority/rootCA.go
+++ b/dfssp/authority/rootCA.go
@@ -68,12 +68,7 @@ func Initialize(bits, days int, country, organization, unit, cn, path string, ca
 	}
 
 	// Save the root certificate.
-	err = ioutil.WriteFile(certPath, cert, 0600)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return ioutil.WriteFile(certPath, cert, 0600)
 }
 
 // Start fetches the platform's private rsa key and root certificate, and create a PlatformID accordingly.
diff --git a/dfssp/common/group_test.go b/dfssp/common/group_test.go
index 172dddca0ef3b712f12e1197b062a650abe89f6a..7385282b0cff3fc2410cce01e423feabdd23ddc8 100644
--- a/dfssp/common/group_test.go
+++ b/dfssp/common/group_test.go
@@ -44,7 +44,7 @@ func TestCloseWaitingGroup(t *testing.T) {
 
 	go func() {
 		myChan, _, _ := w.Join("A")
-		for _ = range myChan {
+		for range myChan {
 			t.Fatal("Should not be here")
 		}
 		// No need to call Unjoin here: if we do, we will try to unjoin a unknown room
diff --git a/dfssp/contract/ready.go b/dfssp/contract/ready.go
index 7e65b1bab87a4875e50bb261061d260ecc27b9f0..288b23cb450220e618e19925b1a130ddd9c2bf64 100644
--- a/dfssp/contract/ready.go
+++ b/dfssp/contract/ready.go
@@ -137,7 +137,7 @@ func FindAndUpdatePendingSigner(mail string, signersReady *[]bool, signers *[]en
 
 	// Check if everyone is ready
 	for _, s := range *signersReady {
-		if s == false {
+		if !s {
 			return
 		}
 	}
diff --git a/mails/email.go b/mails/email.go
index 36053ce0b0f6f389370f9d0e1e9a5ed73ccce57b..d59dc12ec74b4d733e5c88945ee3c437631078bb 100644
--- a/mails/email.go
+++ b/mails/email.go
@@ -143,11 +143,7 @@ func createFullMessage(b io.Writer, receiver, sender, globalHeader, base64Messag
 			return err
 		}
 	}
-	if err := writer.Close(); err != nil {
-		return err
-	}
-
-	return nil
+	return writer.Close()
 }
 
 // Create an attachment with a certain extension