diff --git a/builder/vmware/driver_esx5.go b/builder/vmware/driver_esx5.go
index f23978a32..83d326333 100644
--- a/builder/vmware/driver_esx5.go
+++ b/builder/vmware/driver_esx5.go
@@ -316,7 +316,7 @@ func (d *ESX5Driver) checkGuestIPHackEnabled() error {
 	if record["IntValue"] != "1" {
 		return errors.New(
 			"GuestIPHack is required, enable by running this on the ESX machine:\n" +
-			"esxcli system settings advanced set -o /Net/GuestIPHack -i 1")
+				"esxcli system settings advanced set -o /Net/GuestIPHack -i 1")
 	}
 
 	return nil
diff --git a/packer/rpc/build.go b/packer/rpc/build.go
index f63f35f76..cd06fb64a 100644
--- a/packer/rpc/build.go
+++ b/packer/rpc/build.go
@@ -9,7 +9,7 @@ import (
 // over an RPC connection.
 type build struct {
 	client *rpc.Client
-	mux *MuxConn
+	mux    *MuxConn
 }
 
 // BuildServer wraps a packer.Build implementation and makes it exportable
diff --git a/packer/rpc/builder.go b/packer/rpc/builder.go
index 7721414e2..2b895f1d7 100644
--- a/packer/rpc/builder.go
+++ b/packer/rpc/builder.go
@@ -10,14 +10,14 @@ import (
 // over an RPC connection.
 type builder struct {
 	client *rpc.Client
-	mux *MuxConn
+	mux    *MuxConn
 }
 
 // BuilderServer wraps a packer.Builder implementation and makes it exportable
 // as part of a Golang RPC server.
 type BuilderServer struct {
 	builder packer.Builder
-	mux *MuxConn
+	mux     *MuxConn
 }
 
 type BuilderPrepareArgs struct {
diff --git a/packer/rpc/command.go b/packer/rpc/command.go
index e0243e9bb..e1e6718ed 100644
--- a/packer/rpc/command.go
+++ b/packer/rpc/command.go
@@ -9,19 +9,19 @@ import (
 // command is actually executed over an RPC connection.
 type command struct {
 	client *rpc.Client
-	mux *MuxConn
+	mux    *MuxConn
 }
 
 // A CommandServer wraps a packer.Command and makes it exportable as part
 // of a Golang RPC server.
 type CommandServer struct {
 	command packer.Command
-	mux *MuxConn
+	mux     *MuxConn
 }
 
 type CommandRunArgs struct {
-	Args       []string
-	StreamId   uint32
+	Args     []string
+	StreamId uint32
 }
 
 type CommandSynopsisArgs byte
@@ -42,7 +42,7 @@ func (c *command) Run(env packer.Environment, args []string) (result int) {
 	go server.Serve()
 
 	rpcArgs := &CommandRunArgs{
-		Args: args,
+		Args:     args,
 		StreamId: nextId,
 	}
 	err := c.client.Call("Command.Run", rpcArgs, &result)
diff --git a/packer/rpc/communicator.go b/packer/rpc/communicator.go
index 8f470075e..0931953cc 100644
--- a/packer/rpc/communicator.go
+++ b/packer/rpc/communicator.go
@@ -147,7 +147,7 @@ func (c *communicator) Download(path string, w io.Writer) (err error) {
 	return
 }
 
-func (c *CommunicatorServer) Start(args *CommunicatorStartArgs, reply *interface{}) (error) {
+func (c *CommunicatorServer) Start(args *CommunicatorStartArgs, reply *interface{}) error {
 	// Build the RemoteCmd on this side so that it all pipes over
 	// to the remote side.
 	var cmd packer.RemoteCmd
@@ -197,7 +197,6 @@ func (c *CommunicatorServer) Start(args *CommunicatorStartArgs, reply *interface
 		cmd.Stderr = conn
 	}
 
-
 	// Connect to the response address so we can write our result to it
 	// when ready.
 	responseC, err := c.mux.Dial(args.ResponseStreamId)
diff --git a/packer/rpc/server.go b/packer/rpc/server.go
index bf194bd6c..5d11b403a 100644
--- a/packer/rpc/server.go
+++ b/packer/rpc/server.go
@@ -13,7 +13,7 @@ var endpointId uint64
 
 const (
 	DefaultArtifactEndpoint      string = "Artifact"
-	DefaultBuildEndpoint              = "Build"
+	DefaultBuildEndpoint                = "Build"
 	DefaultBuilderEndpoint              = "Builder"
 	DefaultCacheEndpoint                = "Cache"
 	DefaultCommandEndpoint              = "Command"