diff --git a/.gometalinter.json b/.gometalinter.json
index e7af3259..42ba3bab 100644
--- a/.gometalinter.json
+++ b/.gometalinter.json
@@ -7,6 +7,7 @@
   ],
   "Enable": [
     "deadcode",
+    "goimports",
     "ineffassign",
     "misspell",
     "varcheck",
diff --git a/internal/handshake/server_config.go b/internal/handshake/server_config.go
index 2b7fba67..b015750b 100644
--- a/internal/handshake/server_config.go
+++ b/internal/handshake/server_config.go
@@ -9,10 +9,10 @@ import (
 
 // ServerConfig is a server config
 type ServerConfig struct {
-	kex       crypto.KeyExchange
-	certChain crypto.CertChain
-	ID        []byte
-	obit      []byte
+	kex             crypto.KeyExchange
+	certChain       crypto.CertChain
+	ID              []byte
+	obit            []byte
 	cookieGenerator *CookieGenerator
 }
 
@@ -36,10 +36,10 @@ func NewServerConfig(kex crypto.KeyExchange, certChain crypto.CertChain) (*Serve
 	}
 
 	return &ServerConfig{
-		kex:       kex,
-		certChain: certChain,
-		ID:        id,
-		obit:      obit,
+		kex:             kex,
+		certChain:       certChain,
+		ID:              id,
+		obit:            obit,
 		cookieGenerator: cookieGenerator,
 	}, nil
 }
diff --git a/internal/handshake/server_config_client.go b/internal/handshake/server_config_client.go
index eb042f6f..31653511 100644
--- a/internal/handshake/server_config_client.go
+++ b/internal/handshake/server_config_client.go
@@ -102,13 +102,16 @@ func (s *serverConfigClient) parseValues(tagMap map[Tag][]byte) error {
 		return qerr.Error(qerr.CryptoMessageParameterNotFound, "PUBS")
 	}
 
-	var pubs_kexs []struct{Length uint32; Value []byte}
+	var pubs_kexs []struct {
+		Length uint32
+		Value  []byte
+	}
 	var last_len uint32
 
-	for i := 0; i < len(pubs)-3; i += int(last_len)+3 {
+	for i := 0; i < len(pubs)-3; i += int(last_len) + 3 {
 		// the PUBS value is always prepended by 3 byte little endian length field
 
-		err := binary.Read(bytes.NewReader([]byte{pubs[i], pubs[i+1], pubs[i+2], 0x00}), binary.LittleEndian, &last_len);
+		err := binary.Read(bytes.NewReader([]byte{pubs[i], pubs[i+1], pubs[i+2], 0x00}), binary.LittleEndian, &last_len)
 		if err != nil {
 			return qerr.Error(qerr.CryptoInvalidValueLength, "PUBS not decodable")
 		}
@@ -120,7 +123,10 @@ func (s *serverConfigClient) parseValues(tagMap map[Tag][]byte) error {
 			return qerr.Error(qerr.CryptoInvalidValueLength, "PUBS")
 		}
 
-		pubs_kexs = append(pubs_kexs, struct{Length uint32; Value []byte}{last_len, pubs[i+3:i+3+int(last_len)]})
+		pubs_kexs = append(pubs_kexs, struct {
+			Length uint32
+			Value  []byte
+		}{last_len, pubs[i+3 : i+3+int(last_len)]})
 	}
 
 	if c255Foundat >= len(pubs_kexs) {
@@ -137,7 +143,6 @@ func (s *serverConfigClient) parseValues(tagMap map[Tag][]byte) error {
 		return err
 	}
 
-
 	s.sharedSecret, err = s.kex.CalculateSharedKey(pubs_kexs[c255Foundat].Value)
 	if err != nil {
 		return err