diff --git a/src/safari/safari/SafariExtensionViewController.swift b/src/safari/safari/SafariExtensionViewController.swift
index ad04fb8d3c..3509d1a66e 100644
--- a/src/safari/safari/SafariExtensionViewController.swift
+++ b/src/safari/safari/SafariExtensionViewController.swift
@@ -98,18 +98,16 @@ class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMe
             let options: TabQueryOptions? = jsonDeserialize(json: m!.data)
             if options?.currentWindow ?? false {
                 SFSafariApplication.getActiveWindow { win in
-                    processWindowsForTabs(wins: [win!], options: options
-                                          , complete: { tabs in
-                                              m!.responseData = jsonSerialize(obj: tabs)
-                                              self.replyMessage(message: m!)
+                    processWindowsForTabs(wins: [win!], options: options, complete: { tabs in
+                        m!.responseData = jsonSerialize(obj: tabs)
+                        self.replyMessage(message: m!)
                     })
                 }
             } else {
                 SFSafariApplication.getAllWindows { wins in
-                    processWindowsForTabs(wins: wins, options: options
-                                          , complete: { tabs in
-                                              m!.responseData = jsonSerialize(obj: tabs)
-                                              self.replyMessage(message: m!)
+                    processWindowsForTabs(wins: wins, options: options, complete: { tabs in
+                        m!.responseData = jsonSerialize(obj: tabs)
+                        self.replyMessage(message: m!)
                     })
                 }
             }
@@ -341,9 +339,3 @@ class TabMessage: Decodable, Encodable {
 class TabMessageOptions: Decodable, Encodable {
     var frameId: Int?
 }
-
-class DownloadFileMessage: Decodable, Encodable {
-    var fileName: String
-    var data: String?
-    var type: String?
-}