diff --git a/core/src/main/scala/spark/ShuffleMapTask.scala b/core/src/main/scala/spark/ShuffleMapTask.scala
index 974346e3670d6ceaf4b54816f9d0019b884182db..5321baa527601086b2ff094711923f37d8fd73c0 100644
--- a/core/src/main/scala/spark/ShuffleMapTask.scala
+++ b/core/src/main/scala/spark/ShuffleMapTask.scala
@@ -26,10 +26,9 @@ extends DAGTask[String](stageId) with Logging {
     val ser = SparkEnv.get.serializer.newInstance()
     for (i <- 0 until numOutputSplits) {
       val file = LocalFileShuffle.getOutputFile(dep.shuffleId, partition, i)
-      // TODO: use Serializer instead of ObjectInputStream
-      // TODO: have some kind of EOF marker
       val out = ser.outputStream(new FileOutputStream(file))
       buckets(i).foreach(pair => out.writeObject(pair))
+      // TODO: have some kind of EOF marker
       out.close()
     }
     return LocalFileShuffle.getServerUri