diff --git a/.github/workflows/swiftlint.yml b/.github/workflows/swiftlint.yml
index b54caa63..ba5023f4 100644
--- a/.github/workflows/swiftlint.yml
+++ b/.github/workflows/swiftlint.yml
@@ -9,10 +9,11 @@ on:
 
 jobs:
   SwiftLint:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v1
-      - name: GitHub Action for SwiftLint
-        uses: norio-nomura/action-swiftlint@3.1.0
-        with:
-          args: --config Emitron/.swiftlint.yml
+      - name: Install Swiftlint
+        run: brew install swiftlint
+
+      - name: Run Swiftlint
+        run: swiftlint --config Emitron/.swiftlint.yml
diff --git a/Emitron/Emitron/Constants.swift b/Emitron/Emitron/Constants.swift
index d0f59aaf..ce933268 100644
--- a/Emitron/Emitron/Constants.swift
+++ b/Emitron/Emitron/Constants.swift
@@ -46,7 +46,7 @@ extension String {
   static let library = "Library"
   static let loading = "Loading…"
   static let myTutorials = "My Tutorials"
-  static let newest =  "Newest"
+  static let newest = "Newest"
   static let popularity = "Popularity"
   static let resetFilters = "Reset Filters"
   static let search = "Search…"
diff --git a/Emitron/Emitron/Downloads/DownloadService.swift b/Emitron/Emitron/Downloads/DownloadService.swift
index 00503fbb..5804e607 100644
--- a/Emitron/Emitron/Downloads/DownloadService.swift
+++ b/Emitron/Emitron/Downloads/DownloadService.swift
@@ -555,7 +555,7 @@ extension DownloadService {
 extension DownloadService {
   private func configureWifiObservation() {
     // Track the network status
-    networkMonitor.pathUpdateHandler = { [weak self] path in
+    networkMonitor.pathUpdateHandler = { [weak self] _ in
       self?.checkQueueStatus()
     }
     networkMonitor.start(queue: DispatchQueue.global(qos: .utility))
diff --git a/Emitron/Emitron/Networking/JSONAPI/JSONAPIDocument.swift b/Emitron/Emitron/Networking/JSONAPI/JSONAPIDocument.swift
index 2fc24bbf..f97629f4 100644
--- a/Emitron/Emitron/Networking/JSONAPI/JSONAPIDocument.swift
+++ b/Emitron/Emitron/Networking/JSONAPI/JSONAPIDocument.swift
@@ -33,7 +33,7 @@ class JSONAPIDocument {
   // MARK: - Properties
   var meta: [String: Any] = [:]
   var included: [JSONAPIResource] = []
-  var data: [JSONAPIResource] =  []
+  var data: [JSONAPIResource] = []
   var errors: [JSONAPIError] = []
   var links: [String: URL] = [:]
 
diff --git a/Emitron/Emitron/Networking/JSONAPI/JSONAPIRelationship.swift b/Emitron/Emitron/Networking/JSONAPI/JSONAPIRelationship.swift
index 23a3fa8b..072acedb 100644
--- a/Emitron/Emitron/Networking/JSONAPI/JSONAPIRelationship.swift
+++ b/Emitron/Emitron/Networking/JSONAPI/JSONAPIRelationship.swift
@@ -32,7 +32,7 @@ import SwiftyJSON
 public class JSONAPIRelationship {
   // MARK: - Properties
   var meta: [String: Any] = [:]
-  var data: [JSONAPIResource] =  []
+  var data: [JSONAPIResource] = []
   var links: [String: URL] = [:]
   var type: String = ""
 
diff --git a/Emitron/Emitron/Networking/Requests/Parameters.swift b/Emitron/Emitron/Networking/Requests/Parameters.swift
index f18081b6..e68c88ca 100644
--- a/Emitron/Emitron/Networking/Requests/Parameters.swift
+++ b/Emitron/Emitron/Networking/Requests/Parameters.swift
@@ -206,7 +206,7 @@ enum Param {
   
   static func sort(for value: ParameterSortValue,
                    descending: Bool) -> Parameter {
-    let key =  "sort"
+    let key = "sort"
     let value = "\(descending ? "-" : "")\(value.rawValue)"
     
     return Parameter(key: key, value: value, displayName: "Sort", sortOrdinal: 0)
diff --git a/Emitron/emitronScreenshots/SnapshotHelper.swift b/Emitron/emitronScreenshots/SnapshotHelper.swift
index baefa99d..0c253881 100644
--- a/Emitron/emitronScreenshots/SnapshotHelper.swift
+++ b/Emitron/emitronScreenshots/SnapshotHelper.swift
@@ -238,7 +238,7 @@ open class Snapshot: NSObject {
 
 private extension XCUIElementAttributes {
   var isNetworkLoadingIndicator: Bool {
-    if hasWhiteListedIdentifier {
+    if hasAllowedIdentifier {
       return false
     }
     
@@ -248,10 +248,10 @@ private extension XCUIElementAttributes {
     return hasOldLoadingIndicatorSize || hasNewLoadingIndicatorSize
   }
   
-  var hasWhiteListedIdentifier: Bool {
-    let whiteListedIdentifiers = ["GeofenceLocationTrackingOn", "StandardLocationTrackingOn"]
+  var hasAllowedIdentifier: Bool {
+    let allowedIdentifiers = ["GeofenceLocationTrackingOn", "StandardLocationTrackingOn"]
     
-    return whiteListedIdentifiers.contains(identifier)
+    return allowedIdentifiers.contains(identifier)
   }
   
   func isStatusBar(_ deviceWidth: CGFloat) -> Bool {