diff --git a/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleExternalSorter.java b/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleExternalSorter.java
index 10efa670dda1e..e04ea92a327ae 100644
--- a/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleExternalSorter.java
+++ b/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleExternalSorter.java
@@ -19,7 +19,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.LinkedList;
 
 import org.apache.spark.storage.*;
diff --git a/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleWriter.java b/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleWriter.java
index 6bf4384173fff..1b5af45334238 100644
--- a/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleWriter.java
+++ b/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleWriter.java
@@ -182,15 +182,15 @@ private long[] mergeSpills(SpillInfo[] spills) throws IOException {
     for (int partition = 0; partition < numPartitions; partition++) {
       for (int i = 0; i < spills.length; i++) {
         final long partitionLengthInSpill = spills[i].partitionLengths[partition];
-        long bytesRemainingToBeTransferred = partitionLengthInSpill;
+        long bytesToTransfer = partitionLengthInSpill;
         final FileChannel spillInputChannel = spillInputChannels[i];
-        while (bytesRemainingToBeTransferred > 0) {
+        while (bytesToTransfer > 0) {
           final long actualBytesTransferred = spillInputChannel.transferTo(
               spillInputChannelPositions[i],
-              bytesRemainingToBeTransferred,
+              bytesToTransfer,
               mergedFileOutputChannel);
           spillInputChannelPositions[i] += actualBytesTransferred;
-          bytesRemainingToBeTransferred -= actualBytesTransferred;
+          bytesToTransfer -= actualBytesTransferred;
         }
         partitionLengths[partition] += partitionLengthInSpill;
       }