diff --git a/register/memory.go b/register/memory.go
index b54a552d..c46b5705 100644
--- a/register/memory.go
+++ b/register/memory.go
@@ -29,10 +29,10 @@ type record struct {
 }
 
 type memory struct {
+	sync.RWMutex
 	records  map[string]services
 	watchers map[string]*watcher
 	opts     Options
-	sync.RWMutex
 }
 
 // services is a KV map with service name as the key and a map of records as the value
diff --git a/resolver/dns/dns.go b/resolver/dns/dns.go
index 16569eb8..82de80d5 100644
--- a/resolver/dns/dns.go
+++ b/resolver/dns/dns.go
@@ -12,10 +12,9 @@ import (
 
 // Resolver is a DNS network resolve
 type Resolver struct {
-	goresolver *net.Resolver
-	// Address of resolver to use
-	Address string
 	sync.RWMutex
+	goresolver *net.Resolver
+	Address    string
 }
 
 // Resolve tries to resolve endpoint address
@@ -47,7 +46,7 @@ func (r *Resolver) Resolve(name string) ([]*resolver.Record, error) {
 	if goresolver == nil {
 		r.Lock()
 		r.goresolver = &net.Resolver{
-			Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
+			Dial: func(ctx context.Context, _ string, _ string) (net.Conn, error) {
 				d := net.Dialer{
 					Timeout: time.Millisecond * time.Duration(100),
 				}
diff --git a/server/subscriber.go b/server/subscriber.go
index 765a61ee..54b7a964 100644
--- a/server/subscriber.go
+++ b/server/subscriber.go
@@ -36,11 +36,11 @@ type handler struct {
 type subscriber struct {
 	typ        reflect.Type
 	subscriber interface{}
-	rcvr       reflect.Value
 	topic      string
 	endpoints  []*register.Endpoint
 	handlers   []*handler
 	opts       SubscriberOptions
+	rcvr       reflect.Value
 }
 
 // Is this an exported - upper case - name?
diff --git a/service.go b/service.go
index bf19aa57..87782787 100644
--- a/service.go
+++ b/service.go
@@ -73,9 +73,8 @@ func RegisterSubscriber(topic string, s server.Server, h interface{}, opts ...se
 }
 
 type service struct {
-	opts Options
 	sync.RWMutex
-	//	once sync.Once
+	opts Options
 }
 
 // NewService creates and returns a new Service based on the packages within.
@@ -108,11 +107,6 @@ func (s *service) Init(opts ...Option) error {
 		if err = cfg.Init(config.Context(cfg.Options().Context)); err != nil {
 			return err
 		}
-
-		if err = cfg.Load(cfg.Options().Context); err != nil {
-			return err
-		}
-
 	}
 
 	for _, log := range s.opts.Loggers {
diff --git a/sync/memory.go b/sync/memory.go
index 2777e4d1..813dbd99 100644
--- a/sync/memory.go
+++ b/sync/memory.go
@@ -6,9 +6,9 @@ import (
 )
 
 type memorySync struct {
+	mtx     gosync.RWMutex
 	locks   map[string]*memoryLock
 	options Options
-	mtx     gosync.RWMutex
 }
 
 type memoryLock struct {
diff --git a/util/ring/buffer.go b/util/ring/buffer.go
index 1c25f993..50fe2499 100644
--- a/util/ring/buffer.go
+++ b/util/ring/buffer.go
@@ -10,16 +10,16 @@ import (
 
 // Buffer is ring buffer
 type Buffer struct {
+	sync.RWMutex
 	streams map[string]*Stream
 	vals    []*Entry
 	size    int
-	sync.RWMutex
 }
 
 // Entry is ring buffer data entry
 type Entry struct {
-	Value     interface{}
 	Timestamp time.Time
+	Value     interface{}
 }
 
 // Stream is used to stream the buffer
diff --git a/util/socket/pool.go b/util/socket/pool.go
index 462ce883..470fa3c3 100644
--- a/util/socket/pool.go
+++ b/util/socket/pool.go
@@ -6,8 +6,8 @@ import (
 
 // Pool holds the socket pool
 type Pool struct {
-	pool map[string]*Socket
 	sync.RWMutex
+	pool map[string]*Socket
 }
 
 // Get socket from pool
diff --git a/util/stream/stream.go b/util/stream/stream.go
index c21c9bf8..5e51df98 100644
--- a/util/stream/stream.go
+++ b/util/stream/stream.go
@@ -20,10 +20,10 @@ type Stream interface {
 }
 
 type stream struct {
+	sync.RWMutex
 	Stream
 	err     error
 	request *request
-	sync.RWMutex
 }
 
 type request struct {