diff --git a/client/client_test.go b/client/client_test.go
index dfcf5e8..bf34007 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -16,6 +16,11 @@ import (
 
 const pathContentserver = "/contentserver"
 
+var (
+	testServerSocketAddr    string
+	testServerWebserverAddr string
+)
+
 func dump(t *testing.T, v interface{}) {
 	jsonBytes, err := json.MarshalIndent(v, "", "	")
 	if err != nil {
@@ -42,11 +47,6 @@ func getAvailableAddr() string {
 	return "127.0.0.1:" + strconv.Itoa(getFreePort())
 }
 
-var (
-	testServerSocketAddr    string
-	testServerWebserverAddr string
-)
-
 func initTestServer(t testing.TB) (socketAddr, webserverAddr string) {
 	socketAddr = getAvailableAddr()
 	webserverAddr = getAvailableAddr()
diff --git a/client/connectionpool.go b/client/connectionpool.go
index b5f2dd2..efcc348 100644
--- a/client/connectionpool.go
+++ b/client/connectionpool.go
@@ -34,8 +34,11 @@ func (c *connectionPool) run(connectionPoolSize int, waitTimeout time.Duration)
 		entryTime time.Time
 		chanConn  chan net.Conn
 	}
-	connectionPool := make(map[int]*poolEntry, connectionPoolSize)
-	waitPool := map[int]*waitPoolEntry{}
+
+	var (
+		connectionPool = make(map[int]*poolEntry, connectionPoolSize)
+		waitPool       = map[int]*waitPoolEntry{}
+	)
 	for i := 0; i < connectionPoolSize; i++ {
 		connectionPool[i] = &poolEntry{
 			conn: nil,
@@ -110,8 +113,10 @@ RunLoop:
 			}
 		}
 		// waitpool cleanup
-		waitPoolLoosers := []int{}
-		now := time.Now()
+		var (
+			waitPoolLoosers = []int{}
+			now             = time.Now()
+		)
 		for i, waitPoolEntry := range waitPool {
 			if now.Sub(waitPoolEntry.entryTime) > waitTimeout {
 				waitPoolLoosers = append(waitPoolLoosers, i)
diff --git a/client/sockettransport.go b/client/sockettransport.go
index 0a7959f..e236ed4 100644
--- a/client/sockettransport.go
+++ b/client/sockettransport.go
@@ -64,8 +64,10 @@ func (c *socketTransport) call(handler server.Handler, request interface{}, resp
 	jsonBytes = append([]byte(fmt.Sprintf("%s:%d", handler, len(jsonBytes))), jsonBytes...)
 
 	// send request
-	written := 0
-	l := len(jsonBytes)
+	var (
+		written = 0
+		l       = len(jsonBytes)
+	)
 	for written < l {
 		n, err := conn.Write(jsonBytes[written:])
 		if err != nil {
@@ -76,9 +78,11 @@ func (c *socketTransport) call(handler server.Handler, request interface{}, resp
 	}
 
 	// read response
-	responseBytes := []byte{}
-	buf := make([]byte, 4096)
-	responseLength := 0
+	var (
+		responseBytes  = []byte{}
+		buf            = make([]byte, 4096)
+		responseLength = 0
+	)
 	for {
 		n, err := conn.Read(buf)
 		if err != nil && err != io.EOF {
diff --git a/content/content.go b/content/content.go
index 61cc286..9c67eba 100644
--- a/content/content.go
+++ b/content/content.go
@@ -4,6 +4,6 @@ package content
 const (
 	// Indent for json indentation
 	Indent string = "\t"
-	// PathSeparator seprator for paths in URIs
+	// PathSeparator separator for paths in URIs
 	PathSeparator = "/"
 )
diff --git a/content/reponode.go b/content/reponode.go
index 4c806d1..faf9e79 100644
--- a/content/reponode.go
+++ b/content/reponode.go
@@ -52,15 +52,21 @@ func (node *RepoNode) InPath(path []*Item) bool {
 
 // GetPath get a path for a repo node
 func (node *RepoNode) GetPath() []*Item {
-	parentNode := node.parent
-	pathLength := 0
+
+	var (
+		parentNode = node.parent
+		pathLength = 0
+	)
 	for parentNode != nil {
 		parentNode = parentNode.parent
 		pathLength++
 	}
 	parentNode = node.parent
-	i := 0
-	path := make([]*Item, pathLength)
+
+	var (
+		i    = 0
+		path = make([]*Item, pathLength)
+	)
 	for parentNode != nil {
 		path[i] = parentNode.ToItem([]string{})
 		parentNode = parentNode.parent
diff --git a/contentserver.go b/contentserver.go
index 425b1a2..59643f3 100644
--- a/contentserver.go
+++ b/contentserver.go
@@ -3,11 +3,12 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/foomo/contentserver/metrics"
-	"github.com/foomo/contentserver/status"
 	"os"
 	"strings"
 
+	"github.com/foomo/contentserver/metrics"
+	"github.com/foomo/contentserver/status"
+
 	"github.com/foomo/contentserver/log"
 	"github.com/foomo/contentserver/server"
 )
@@ -18,11 +19,8 @@ const (
 	logLevelWarning = "warning"
 	logLevelRecord  = "record"
 	logLevelError   = "error"
-)
-
-const (
-	ServiceName = "Content Server"
 
+	ServiceName                  = "Content Server"
 	DefaultHealthzHandlerAddress = ":8080"
 	DefaultPrometheusListener    = ":9200"
 )
diff --git a/server/socketserver.go b/server/socketserver.go
index d030ed7..cb07f57 100644
--- a/server/socketserver.go
+++ b/server/socketserver.go
@@ -70,9 +70,12 @@ func (s *socketServer) writeResponse(conn net.Conn, reply []byte) {
 
 func (s *socketServer) handleConnection(conn net.Conn) {
 	log.Debug("socketServer.handleConnection")
-	var headerBuffer [1]byte
-	header := ""
-	i := 0
+
+	var (
+		headerBuffer [1]byte
+		header       = ""
+		i            = 0
+	)
 	for {
 		i++
 		// fmt.Println("---->", i)
diff --git a/status/metrics.go b/status/metrics.go
index 212ae29..8ccc82d 100644
--- a/status/metrics.go
+++ b/status/metrics.go
@@ -4,8 +4,10 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const MetricLabelHandler = "handler"
-const MetricLabelStatus = "status"
+const (
+	MetricLabelHandler = "handler"
+	MetricLabelStatus  = "status"
+)
 
 type Metrics struct {
 	ServiceRequestCounter  *prometheus.CounterVec // count the number of requests for each service function