diff --git a/Evergreen/FeedList/FeedListViewController.swift b/Evergreen/FeedList/FeedListViewController.swift
index b925e01f5..9cc83a96b 100644
--- a/Evergreen/FeedList/FeedListViewController.swift
+++ b/Evergreen/FeedList/FeedListViewController.swift
@@ -91,7 +91,7 @@ extension FeedListViewController: NSOutlineViewDataSource {
 
 	func outlineView(_ outlineView: NSOutlineView, child index: Int, ofItem item: Any?) -> Any {
 
-		return nodeForItem(item as AnyObject?).childNodes![index]
+		return nodeForItem(item as AnyObject?).childNodes[index]
 	}
 
 	func outlineView(_ outlineView: NSOutlineView, isItemExpandable item: Any) -> Bool {
diff --git a/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift b/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift
index e741f0c18..9b838e785 100644
--- a/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift
+++ b/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift
@@ -147,9 +147,8 @@ private extension AddFeedWindowController {
 		menuItem.representedObject = folderTreeController.rootNode.representedObject
 		menu.addItem(menuItem)
 
-		if let childNodes = folderTreeController.rootNode.childNodes {
-			addFolderItemsToMenuWithNodes(menu: menu, nodes: childNodes, indentationLevel: 1)
-		}
+		let childNodes = folderTreeController.rootNode.childNodes
+		addFolderItemsToMenuWithNodes(menu: menu, nodes: childNodes, indentationLevel: 1)
 
 		return menu
 	}
@@ -166,7 +165,7 @@ private extension AddFeedWindowController {
 				menu.addItem(menuItem)
 
 				if oneNode.numberOfChildNodes > 0 {
-					addFolderItemsToMenuWithNodes(menu: menu, nodes: oneNode.childNodes!, indentationLevel: indentationLevel + 1)
+					addFolderItemsToMenuWithNodes(menu: menu, nodes: oneNode.childNodes, indentationLevel: indentationLevel + 1)
 				}
 			}
 		}
diff --git a/Evergreen/MainWindow/Sidebar/SidebarOutlineDataSource.swift b/Evergreen/MainWindow/Sidebar/SidebarOutlineDataSource.swift
index 5b8b30e88..844eba921 100644
--- a/Evergreen/MainWindow/Sidebar/SidebarOutlineDataSource.swift
+++ b/Evergreen/MainWindow/Sidebar/SidebarOutlineDataSource.swift
@@ -28,7 +28,7 @@ import RSCore
 
 	func outlineView(_ outlineView: NSOutlineView, child index: Int, ofItem item: Any?) -> Any {
 
-		return nodeForItem(item as AnyObject?).childNodes![index]
+		return nodeForItem(item as AnyObject?).childNodes[index]
 	}
 
 	func outlineView(_ outlineView: NSOutlineView, isItemExpandable item: Any) -> Bool {