diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go
index 642f4925d..de3a840b1 100644
--- a/builder/amazon/chroot/builder.go
+++ b/builder/amazon/chroot/builder.go
@@ -166,9 +166,10 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 	ec2conn := ec2.New(auth, region)
 
 	wrappedCommand := func(command string) *exec.Cmd {
-		wrapped, err := b.config.tpl.Process(b.config.CommandWrapper, &wrappedCommandTemplate{
-			Command: command,
-		})
+		wrapped, err := b.config.tpl.Process(
+			b.config.CommandWrapper, &wrappedCommandTemplate{
+				Command: command,
+			})
 		if err != nil {
 			ui.Error(err.Error())
 		}
diff --git a/builder/amazon/chroot/communicator.go b/builder/amazon/chroot/communicator.go
index 37a9bbdf8..8e6bc90bf 100644
--- a/builder/amazon/chroot/communicator.go
+++ b/builder/amazon/chroot/communicator.go
@@ -96,6 +96,7 @@ func (c *Communicator) UploadDir(dst string, src string, exclude []string) error
 		}
 	*/
 
+	// TODO: remove any file copied if it appears in `exclude`
 	chrootDest := filepath.Join(c.Chroot, dst)
 	log.Printf("Uploading directory '%s' to '%s'", src, chrootDest)
 	cpCmd := fmt.Sprintf("cp -R %s* %s", src, chrootDest)