diff --git a/service/test/integration_test.go b/service/test/integration_test.go
index e5e2abdb..d3a3aa41 100644
--- a/service/test/integration_test.go
+++ b/service/test/integration_test.go
@@ -646,9 +646,9 @@ func TestClientServer_SetVariable(t *testing.T) {
 			t.Fatalf("Continue(): %v\n", state.Err)
 		}
 
-		assertNoError(c.SetVariable(api.EvalScope{ -1, 0 }, "a2", "8"), t, "SetVariable()")
+		assertNoError(c.SetVariable(api.EvalScope{-1, 0}, "a2", "8"), t, "SetVariable()")
 
-		a2, err := c.EvalVariable(api.EvalScope{ -1, 0 }, "a2")
+		a2, err := c.EvalVariable(api.EvalScope{-1, 0}, "a2")
 
 		t.Logf("a2: <%s>", a2.Value)
 
diff --git a/terminal/command.go b/terminal/command.go
index 45e51465..8fa40b4d 100644
--- a/terminal/command.go
+++ b/terminal/command.go
@@ -41,9 +41,9 @@ func (c command) match(cmdstr string) bool {
 }
 
 type Commands struct {
-	cmds            []command
-	lastCmd         cmdfunc
-	client          service.Client
+	cmds    []command
+	lastCmd cmdfunc
+	client  service.Client
 }
 
 // Returns a Commands struct with default commands defined.
diff --git a/terminal/terminal.go b/terminal/terminal.go
index 932af116..24f62b84 100644
--- a/terminal/terminal.go
+++ b/terminal/terminal.go
@@ -21,11 +21,11 @@ const (
 )
 
 type Term struct {
-	client service.Client
-	prompt string
-	line   *liner.State
-	conf   *config.Config
-	dumb   bool
+	client   service.Client
+	prompt   string
+	line     *liner.State
+	conf     *config.Config
+	dumb     bool
 	InitFile string
 }