diff --git a/waveshell/pkg/cmdtail/cmdtail.go b/waveshell/pkg/cmdtail/cmdtail.go
index 83fa92b3f..fed754ad4 100644
--- a/waveshell/pkg/cmdtail/cmdtail.go
+++ b/waveshell/pkg/cmdtail/cmdtail.go
@@ -137,7 +137,7 @@ func (t *Tailer) addSessionWatcher(sessionId string) error {
 	defer t.Lock.Unlock()
 
 	if t.Sessions[sessionId] {
-		return
+		return nil
 	}
 	sdir := t.Gen.SessionDir(sessionId)
 	err := t.Watcher.Add(sdir)
@@ -351,7 +351,6 @@ func (t *Tailer) Run() {
 			t.Sender.SendPacket(packet.FmtMessagePacket("error in tailer: %v", err))
 		}
 	}
-	return
 }
 
 func (t *Tailer) Close() error {
diff --git a/wavesrv/pkg/cmdrunner/cmdrunner.go b/wavesrv/pkg/cmdrunner/cmdrunner.go
index 0742fc13d..ab6600732 100644
--- a/wavesrv/pkg/cmdrunner/cmdrunner.go
+++ b/wavesrv/pkg/cmdrunner/cmdrunner.go
@@ -93,14 +93,14 @@ var SetVarNameMap map[string]string = map[string]string{
 }
 
 var SetVarScopes = []SetVarScope{
-	SetVarScope{ScopeName: "global", VarNames: []string{}},
-	SetVarScope{ScopeName: "client", VarNames: []string{"telemetry"}},
-	SetVarScope{ScopeName: "session", VarNames: []string{"name", "pos"}},
-	SetVarScope{ScopeName: "screen", VarNames: []string{"name", "tabcolor", "tabicon", "pos", "pterm", "anchor", "focus", "line"}},
-	SetVarScope{ScopeName: "line", VarNames: []string{}},
+	{ScopeName: "global", VarNames: []string{}},
+	{ScopeName: "client", VarNames: []string{"telemetry"}},
+	{ScopeName: "session", VarNames: []string{"name", "pos"}},
+	{ScopeName: "screen", VarNames: []string{"name", "tabcolor", "tabicon", "pos", "pterm", "anchor", "focus", "line"}},
+	{ScopeName: "line", VarNames: []string{}},
 	// connection = remote, remote = remoteinstance
-	SetVarScope{ScopeName: "connection", VarNames: []string{"alias", "connectmode", "key", "password", "autoinstall", "color"}},
-	SetVarScope{ScopeName: "remote", VarNames: []string{}},
+	{ScopeName: "connection", VarNames: []string{"alias", "connectmode", "key", "password", "autoinstall", "color"}},
+	{ScopeName: "remote", VarNames: []string{}},
 }
 
 var hostNameRe = regexp.MustCompile("^[a-z][a-z0-9.-]*$")
diff --git a/wavesrv/pkg/cmdrunner/shparse.go b/wavesrv/pkg/cmdrunner/shparse.go
index 561dc0369..67e21182d 100644
--- a/wavesrv/pkg/cmdrunner/shparse.go
+++ b/wavesrv/pkg/cmdrunner/shparse.go
@@ -25,16 +25,16 @@ type BareMetaCmdDecl struct {
 }
 
 var BareMetaCmds = []BareMetaCmdDecl{
-	BareMetaCmdDecl{"cr", "cr"},
-	BareMetaCmdDecl{"connect", "cr"},
-	BareMetaCmdDecl{"clear", "clear"},
-	BareMetaCmdDecl{"reset", "reset"},
-	BareMetaCmdDecl{"codeedit", "codeedit"},
-	BareMetaCmdDecl{"codeview", "codeview"},
-	BareMetaCmdDecl{"imageview", "imageview"},
-	BareMetaCmdDecl{"markdownview", "markdownview"},
-	BareMetaCmdDecl{"mdview", "markdownview"},
-	BareMetaCmdDecl{"csvview", "csvview"},
+	{"cr", "cr"},
+	{"connect", "cr"},
+	{"clear", "clear"},
+	{"reset", "reset"},
+	{"codeedit", "codeedit"},
+	{"codeview", "codeview"},
+	{"imageview", "imageview"},
+	{"markdownview", "markdownview"},
+	{"mdview", "markdownview"},
+	{"csvview", "csvview"},
 }
 
 const (