diff --git a/Riot/Modules/Settings/KeyBackup/SettingsKeyBackupTableViewSection.swift b/Riot/Modules/Settings/KeyBackup/SettingsKeyBackupTableViewSection.swift
index e6b04bcfc..3bed6ca45 100644
--- a/Riot/Modules/Settings/KeyBackup/SettingsKeyBackupTableViewSection.swift
+++ b/Riot/Modules/Settings/KeyBackup/SettingsKeyBackupTableViewSection.swift
@@ -32,7 +32,7 @@ import UIKit
     func settingsKeyBackup(_ settingsKeyBackupTableViewSection: SettingsKeyBackupTableViewSection, showError error:Error)
 }
 
-@objc class SettingsKeyBackupTableViewSection: NSObject {
+@objc final class SettingsKeyBackupTableViewSection: NSObject {
 
     // MARK: - Properties
 
@@ -68,11 +68,11 @@ import UIKit
             numberOfRows = self.numberOfCheckingBackupRows()
         case .noBackup:
             numberOfRows = self.numberOfNoBackupRows()
-        case .backup(_, _):
+        case .backup:
             numberOfRows = self.numberOfBackupRows()
-        case .backupAndRunning(_, _, _):
+        case .backupAndRunning:
             numberOfRows = self.numberOfBackupAndRunningRows()
-        case .backupNotTrusted(_, _):
+        case .backupNotTrusted:
             numberOfRows = self.numberOfBackupNotTrustedRows()
         }
 
@@ -507,7 +507,6 @@ extension SettingsKeyBackupTableViewSection: SettingsKeyBackupViewModelViewDeleg
             self.delegate?.settingsKeyBackup(self, showActivityIndicator: false)
         case .error(let error):
             self.delegate?.settingsKeyBackup(self, showError: error)
-            break
         }
     }
 
diff --git a/Riot/Modules/Settings/KeyBackup/SettingsKeyBackupViewModel.swift b/Riot/Modules/Settings/KeyBackup/SettingsKeyBackupViewModel.swift
index f04ea144c..8187fc89f 100644
--- a/Riot/Modules/Settings/KeyBackup/SettingsKeyBackupViewModel.swift
+++ b/Riot/Modules/Settings/KeyBackup/SettingsKeyBackupViewModel.swift
@@ -16,7 +16,7 @@
 
 import UIKit
 
-class SettingsKeyBackupViewModel: SettingsKeyBackupViewModelType {
+final class SettingsKeyBackupViewModel: SettingsKeyBackupViewModelType {
 
     // MARK: - Properties
     weak var viewDelegate: SettingsKeyBackupViewModelViewDelegate?
@@ -44,7 +44,7 @@ class SettingsKeyBackupViewModel: SettingsKeyBackupViewModelType {
 
         switch viewAction {
         case .load:
-            self.viewDelegate?.settingsKeyBackupViewModel(self, didUpdateViewState: .checkingBackup)
+            viewDelegate?.settingsKeyBackupViewModel(self, didUpdateViewState: .checkingBackup)
             self.checkKeyBackupState()
         case .create:
             viewDelegate.settingsKeyBackupViewModelShowKeyBackupSetup(self)
@@ -66,7 +66,7 @@ class SettingsKeyBackupViewModel: SettingsKeyBackupViewModelType {
 
     // MARK: - Private
 
-    func checkKeyBackupState() {
+    private func checkKeyBackupState() {
 
         if let keyBackupVersion = self.keyBackup.keyBackupVersion {