diff --git a/internal/debug/flags.go b/internal/debug/flags.go
index ed17f87c45..d7bbfae1eb 100644
--- a/internal/debug/flags.go
+++ b/internal/debug/flags.go
@@ -53,7 +53,7 @@ var (
 		Value: 6060,
 	}
 	pprofAddrFlag = cli.StringFlag{
-		Name: "pprofaddr",
+		Name:  "pprofaddr",
 		Usage: "pprof HTTP server listening interface",
 		Value: "127.0.0.1",
 	}
diff --git a/internal/ethapi/tracer.go b/internal/ethapi/tracer.go
index c6d4f814ec..5f69826a3b 100644
--- a/internal/ethapi/tracer.go
+++ b/internal/ethapi/tracer.go
@@ -167,17 +167,17 @@ func (dw *dbWrapper) toValue(vm *otto.Otto) otto.Value {
 // JavascriptTracer provides an implementation of Tracer that evaluates a
 // Javascript function for each VM execution step.
 type JavascriptTracer struct {
-	vm          *otto.Otto             // Javascript VM instance
-	traceobj    *otto.Object           // User-supplied object to call
-	log         map[string]interface{} // (Reusable) map for the `log` arg to `step`
-	logvalue    otto.Value             // JS view of `log`
-	memory      *memoryWrapper         // Wrapper around the VM memory
-	memvalue    otto.Value             // JS view of `memory`
-	stack       *stackWrapper          // Wrapper around the VM stack
-	stackvalue  otto.Value             // JS view of `stack`
-	db          *dbWrapper             // Wrapper around the VM environment
-	dbvalue     otto.Value             // JS view of `db`
-	err         error                  // Error, if one has occurred
+	vm         *otto.Otto             // Javascript VM instance
+	traceobj   *otto.Object           // User-supplied object to call
+	log        map[string]interface{} // (Reusable) map for the `log` arg to `step`
+	logvalue   otto.Value             // JS view of `log`
+	memory     *memoryWrapper         // Wrapper around the VM memory
+	memvalue   otto.Value             // JS view of `memory`
+	stack      *stackWrapper          // Wrapper around the VM stack
+	stackvalue otto.Value             // JS view of `stack`
+	db         *dbWrapper             // Wrapper around the VM environment
+	dbvalue    otto.Value             // JS view of `db`
+	err        error                  // Error, if one has occurred
 }
 
 // NewJavascriptTracer instantiates a new JavascriptTracer instance.
@@ -222,17 +222,17 @@ func NewJavascriptTracer(code string) (*JavascriptTracer, error) {
 	db := &dbWrapper{}
 
 	return &JavascriptTracer{
-		vm:          vm,
-		traceobj:    jstracer,
-		log:         log,
-		logvalue:    logvalue,
-		memory:      mem,
-		memvalue:    mem.toValue(vm),
-		stack:       stack,
-		stackvalue:  stack.toValue(vm),
-		db:          db,
-		dbvalue:     db.toValue(vm),
-		err:         nil,
+		vm:         vm,
+		traceobj:   jstracer,
+		log:        log,
+		logvalue:   logvalue,
+		memory:     mem,
+		memvalue:   mem.toValue(vm),
+		stack:      stack,
+		stackvalue: stack.toValue(vm),
+		db:         db,
+		dbvalue:    db.toValue(vm),
+		err:        nil,
 	}, nil
 }
 
diff --git a/rpc/http.go b/rpc/http.go
index c923580bfe..7d4fe5d474 100644
--- a/rpc/http.go
+++ b/rpc/http.go
@@ -170,7 +170,7 @@ func newCorsHandler(srv *Server, corsString string) http.Handler {
 	c := cors.New(cors.Options{
 		AllowedOrigins: allowedOrigins,
 		AllowedMethods: []string{"POST", "GET"},
-		MaxAge: 600,
+		MaxAge:         600,
 	})
 	return c.Handler(srv)
 }
diff --git a/swarm/storage/chunker_test.go b/swarm/storage/chunker_test.go
index 4f05cd1cc3..40f870246f 100644
--- a/swarm/storage/chunker_test.go
+++ b/swarm/storage/chunker_test.go
@@ -28,7 +28,6 @@ import (
 	"time"
 )
 
-
 /*
 Tests TreeChunker by splitting and joining a random byte slice
 */