diff --git a/.swiftlint.yml b/.swiftlint.yml
index d63d8c637..2adceb13b 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -1,6 +1,6 @@
 identifier_name:
   min_length: 1
-  max_length: 40
+  max_length: 50
   allowed_patterns: ^_.*$
 
 line_length:
diff --git a/Modules/Account/Sources/Account/Feed.swift b/Modules/Account/Sources/Account/Feed.swift
index 726529ce6..1af9138ed 100644
--- a/Modules/Account/Sources/Account/Feed.swift
+++ b/Modules/Account/Sources/Account/Feed.swift
@@ -265,7 +265,7 @@ public final class Feed: SidebarItem, Renamable, Hashable {
 
 	// MARK: - Equatable
 
-	public class func ==(lhs: Feed, rhs: Feed) -> Bool {
+	public static func ==(lhs: Feed, rhs: Feed) -> Bool {
 		return lhs.feedID == rhs.feedID && lhs.accountID == rhs.accountID
 	}
 }
diff --git a/Modules/Account/Sources/Account/NewsBlur/Models/NewsBlurStory.swift b/Modules/Account/Sources/Account/NewsBlur/Models/NewsBlurStory.swift
index 45895e785..bfc931178 100644
--- a/Modules/Account/Sources/Account/NewsBlur/Models/NewsBlurStory.swift
+++ b/Modules/Account/Sources/Account/NewsBlur/Models/NewsBlurStory.swift
@@ -38,7 +38,7 @@ struct NewsBlurStoriesResponse: Decodable {
 
 extension NewsBlurStoriesResponse {
 	private enum CodingKeys: String, CodingKey {
-		case stories = "stories"
+		case stories
 	}
 }
 
diff --git a/Modules/Account/Sources/Account/OPMLNormalizer.swift b/Modules/Account/Sources/Account/OPMLNormalizer.swift
index 23a046ec6..bfb4067bd 100644
--- a/Modules/Account/Sources/Account/OPMLNormalizer.swift
+++ b/Modules/Account/Sources/Account/OPMLNormalizer.swift
@@ -24,14 +24,14 @@ final class OPMLNormalizer {
 
 		for item in items {
 
-			if let _ = item.feedSpecifier {
+			if item.feedSpecifier != nil {
 				if !feedsToAdd.contains(where: { $0.feedSpecifier?.feedURL == item.feedSpecifier?.feedURL }) {
 					feedsToAdd.append(item)
 				}
 				continue
 			}
 
-			guard let _ = item.titleFromAttributes else {
+			guard item.titleFromAttributes != nil else {
 				// Folder doesn’t have a name, so it won’t be created, and its items will go one level up.
 				if let itemChildren = item.items {
 					normalize(itemChildren, parentFolder: parentFolder)