diff --git a/container_linux.go b/container_linux.go
index 76fd4f08b..aa88aed00 100644
--- a/container_linux.go
+++ b/container_linux.go
@@ -295,7 +295,7 @@ func (c *linuxContainer) Checkpoint() error {
 				"--ext-mount-map", fmt.Sprintf("%s:%s", m.Destination, m.Destination))
 		}
 	}
-	addArgsFromEnv("CRIU_C", &args)	// XXX debug
+	addArgsFromEnv("CRIU_C", &args) // XXX debug
 	if err := exec.Command(c.criuPath, args...).Run(); err != nil {
 		return err
 	}
@@ -337,16 +337,16 @@ func (c *linuxContainer) Restore(process *Process) error {
 			args = append(args, "--inherit-fd", fmt.Sprintf("fd[%d]:%s", i, s))
 		}
 	}
-	addArgsFromEnv("CRIU_R", &args)	// XXX debug
+	addArgsFromEnv("CRIU_R", &args) // XXX debug
 
 	// XXX This doesn't really belong here as our caller should have
 	//     already set up root (including devices) and mounted it.
-/*
-	// remount root for restore
-	if err := syscall.Mount(c.config.Rootfs, c.config.Rootfs, "bind", syscall.MS_BIND|syscall.MS_REC, ""); err != nil {
-		return err
-	}
-*/
+	/*
+		// remount root for restore
+		if err := syscall.Mount(c.config.Rootfs, c.config.Rootfs, "bind", syscall.MS_BIND|syscall.MS_REC, ""); err != nil {
+			return err
+		}
+	*/
 
 	defer syscall.Unmount(c.config.Rootfs, syscall.MNT_DETACH)
 	cmd := exec.Command(c.criuPath, args...)
diff --git a/nsinit/restore.go b/nsinit/restore.go
index 3ae9117e8..d31401fb1 100644
--- a/nsinit/restore.go
+++ b/nsinit/restore.go
@@ -28,9 +28,9 @@ var restoreCommand = cli.Command{
 		}
 		//rootuid, err := config.HostUID()
 		//if err != nil {
-			//fatal(err)
+		//fatal(err)
 		//}
-		rootuid := 0	// XXX
+		rootuid := 0 // XXX
 		tty, err := newTty(context, process, rootuid)
 		if err != nil {
 			fatal(err)