diff --git a/Evergreen.xcodeproj/project.pbxproj b/Evergreen.xcodeproj/project.pbxproj
index e4e11c502..f7a18e105 100644
--- a/Evergreen.xcodeproj/project.pbxproj
+++ b/Evergreen.xcodeproj/project.pbxproj
@@ -1164,6 +1164,7 @@
 				849C64641ED37A5D003D8FC0 /* AppDelegate.swift in Sources */,
 				84E46C7D1F75EF7B005ECFB3 /* AppDefaults.swift in Sources */,
 				842E45CE1ED8C308000A8B52 /* AppNotifications.swift in Sources */,
+				84DAEE321F870B390058304B /* DockBadge.swift in Sources */,
 				842E45DD1ED8C54B000A8B52 /* Browser.swift in Sources */,
 				842E45E31ED8C681000A8B52 /* KeyboardDelegateProtocol.swift in Sources */,
 				849A975E1ED9EB72007D329B /* MainWindowController.swift in Sources */,
@@ -1181,7 +1182,6 @@
 				849A97791ED9EC04007D329B /* TimelineStringUtilities.swift in Sources */,
 				849A97981ED9EFAA007D329B /* Node-Extensions.swift in Sources */,
 				849A97531ED9EAC0007D329B /* AddFeedController.swift in Sources */,
-				84DAEE321F870B390058304B /* DockBadge.swift in Sources */,
 				849A97831ED9EC63007D329B /* StatusBarView.swift in Sources */,
 				849A97431ED9EAA9007D329B /* AddFolderWindowController.swift in Sources */,
 				849A97921ED9EF65007D329B /* IndeterminateProgressWindowController.swift in Sources */,
diff --git a/Evergreen/MainWindow/MainWindowController.swift b/Evergreen/MainWindow/MainWindowController.swift
index ed7bbd79f..7cd7f7126 100644
--- a/Evergreen/MainWindow/MainWindowController.swift
+++ b/Evergreen/MainWindow/MainWindowController.swift
@@ -21,7 +21,6 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
         
         super.windowDidLoad()
         
-//		window?.titleVisibility = .hidden
 		window?.setFrameUsingName(windowAutosaveName, force: true)
 		
 		detailSplitViewItem?.minimumThickness = 384
@@ -54,12 +53,12 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
 
 	@objc func refreshProgressDidChange(_ note: Notification) {
 		
-		rs_performSelectorCoalesced(#selector(MainWindowController.coalescedMakeToolbarValidate(_:)), with: nil, afterDelay: 0.1)
+		rs_performSelectorCoalesced(#selector(MainWindowController.makeToolbarValidate(_:)), with: nil, afterDelay: 0.1)
 	}
 	
 	// MARK: Toolbar
 	
-	@objc func coalescedMakeToolbarValidate(_ sender: Any) {
+	@objc func makeToolbarValidate(_ sender: Any) {
 		
 		window?.toolbar?.validateVisibleItems()
 	}
@@ -123,6 +122,8 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
 	}
 }
 
+// MARK: - Private
+
 private extension MainWindowController {
 	
 	var splitViewController: NSSplitViewController? {
@@ -147,12 +148,12 @@ private extension MainWindowController {
 	}
 	
 	var detailSplitViewItem: NSSplitViewItem? {
-		
-		return splitViewController?.splitViewItems[2]
+		get {
+			return splitViewController?.splitViewItems[2]
+		}
 	}
 	
 	var detailViewController: DetailViewController? {
-
 		get {
 			return splitViewController?.splitViewItems[2].viewController as? DetailViewController
 		}
@@ -175,10 +176,7 @@ private extension MainWindowController {
 	
 	var currentLink: String? {
 		get {
-			if let article = oneSelectedArticle {
-				return article.preferredLink
-			}
-			return nil
+			return oneSelectedArticle?.preferredLink
 		}
 	}