diff --git a/core/src/main/scala/org/apache/spark/broadcast/HttpBroadcast.scala b/core/src/main/scala/org/apache/spark/broadcast/HttpBroadcast.scala
index d8981bb42e684..79216bd2b8404 100644
--- a/core/src/main/scala/org/apache/spark/broadcast/HttpBroadcast.scala
+++ b/core/src/main/scala/org/apache/spark/broadcast/HttpBroadcast.scala
@@ -219,12 +219,12 @@ private[spark] object HttpBroadcast extends Logging {
 
   private def deleteBroadcastFile(file: File) {
     try {
-      if (!file.exists) {
-        logWarning("Broadcast file to be deleted does not exist: %s".format(file))
-      } else if (file.delete()) {
-        logInfo("Deleted broadcast file: %s".format(file))
-      } else {
-        logWarning("Could not delete broadcast file: %s".format(file))
+      if (file.exists) {
+        if (file.delete()) {
+          logInfo("Deleted broadcast file: %s".format(file))
+        } else {
+          logWarning("Could not delete broadcast file: %s".format(file))
+        }
       }
     } catch {
       case e: Exception =>
diff --git a/core/src/main/scala/org/apache/spark/storage/BlockManager.scala b/core/src/main/scala/org/apache/spark/storage/BlockManager.scala
index 991881b00c0eb..c90abb187bdb1 100644
--- a/core/src/main/scala/org/apache/spark/storage/BlockManager.scala
+++ b/core/src/main/scala/org/apache/spark/storage/BlockManager.scala
@@ -209,7 +209,7 @@ private[spark] class BlockManager(
     }
   }
 
-  /** Get the BlockStatus for the block identified by the given ID, if it exists.*/
+  /** Get the BlockStatus for the block identified by the given ID, if it exists. */
   def getStatus(blockId: BlockId): Option[BlockStatus] = {
     blockInfo.get(blockId).map { info =>
       val memSize = if (memoryStore.contains(blockId)) memoryStore.getSize(blockId) else 0L