diff --git a/config.go b/config.go
index a13fe2e..d9ffaf5 100644
--- a/config.go
+++ b/config.go
@@ -6,11 +6,11 @@ import (
 )
 
 type Config struct {
-	ProfileDir     	string `json:"profile_dir"`
-	ShellPath      	string `json:"shell_path"`
-	SandboxPath    	string `json:"sandbox_path"`
-	AllowRootShell 	bool   `json:"allow_root_shell"`
-	LogXpra        	bool   `json:"log_xpra"`
+	ProfileDir     string `json:"profile_dir"`
+	ShellPath      string `json:"shell_path"`
+	SandboxPath    string `json:"sandbox_path"`
+	AllowRootShell bool   `json:"allow_root_shell"`
+	LogXpra        bool   `json:"log_xpra"`
 }
 
 const DefaultConfigPath = "/etc/oz/oz.conf"
diff --git a/ipc/ipc_test.go b/ipc/ipc_test.go
index d5311a1..c385b83 100644
--- a/ipc/ipc_test.go
+++ b/ipc/ipc_test.go
@@ -34,11 +34,11 @@ func testConnect(handler func(*TestMsg, *Message) error) (*testConnection, error
 		tc.wg.Done()
 		return err
 	}
-	s,err  := NewServer(testSocket, testFactory, nil, wrapper)
+	s, err := NewServer(testSocket, testFactory, nil, wrapper)
 	if err != nil {
 		return nil, err
 	}
-	c,err := Connect(testSocket, testFactory, nil)
+	c, err := Connect(testSocket, testFactory, nil)
 	if err != nil {
 		return nil, err
 	}
diff --git a/oz-daemon/launch.go b/oz-daemon/launch.go
index e8fa4ec..0736736 100644
--- a/oz-daemon/launch.go
+++ b/oz-daemon/launch.go
@@ -187,12 +187,12 @@ func (sbox *Sandbox) startXpraClient() {
 }
 
 func (sbox *Sandbox) setupXpraLogging() {
-	stdout,err := sbox.xpra.Process.StdoutPipe()
+	stdout, err := sbox.xpra.Process.StdoutPipe()
 	if err != nil {
 		sbox.daemon.Warning("Failed to create xpra stdout pipe: %v", err)
 		return
 	}
-	stderr,err := sbox.xpra.Process.StderrPipe()
+	stderr, err := sbox.xpra.Process.StderrPipe()
 	if err != nil {
 		stdout.Close()
 		sbox.daemon.Warning("Failed to create xpra stderr pipe: %v", err)