diff --git a/Riot/Modules/SplitView/SplitViewCoordinator.swift b/Riot/Modules/SplitView/SplitViewCoordinator.swift
index b1c6df26b..58c9cac5d 100644
--- a/Riot/Modules/SplitView/SplitViewCoordinator.swift
+++ b/Riot/Modules/SplitView/SplitViewCoordinator.swift
@@ -329,12 +329,12 @@ extension SplitViewCoordinator: SplitViewMasterPresentableDelegate {
         // Reset the detail navigation controller with the given detail controller
         self.detailNavigationRouter?.setRootModule(detailPresentable, popCompletion: popCompletion)
         
-        // This will call first UISplitViewControllerDelegate method: `splitViewController(_:showDetail:sender:)`, if implemented, to give the opportunity to customise `UISplitViewController.showDetailViewController(:sender:)` behaviour.
-        // - If the split view controller is collapsed (one column visible):
+        // This will call first UISplitViewControllerDelegate method:  `splitViewController(_:showDetail:sender:)`, if implemented, to give the opportunity to customise `UISplitViewController.showDetailViewController(:sender:)` behavior.
+        // - If the split view controller is collpased (one column visible):
         // The `detailNavigationController` will be pushed on top of the primary navigation controller.
         // In fact if the primary root controller of a UISplitViewController is a UINavigationController,
         // it's possible to have nested navigation controllers due to private property `_allowNestedNavigationControllers` set to true (https://blog.malcolmhall.com/2017/01/27/default-behaviour-of-uisplitviewcontroller-collapsesecondaryviewcontroller/).
-        // - Else if the split view controller is not collapsed (two column visible)
+        // - Else if the split view controller is not collpased (two column visible)
         // It will set the `detailNavigationController` as the secondary view of the split view controller
         self.splitViewController.showDetailViewController(detailNavigationController, sender: nil)
         
diff --git a/Riot/Modules/TabBar/TabBarCoordinator.swift b/Riot/Modules/TabBar/TabBarCoordinator.swift
index e128d227d..fad98dda4 100644
--- a/Riot/Modules/TabBar/TabBarCoordinator.swift
+++ b/Riot/Modules/TabBar/TabBarCoordinator.swift
@@ -95,14 +95,13 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
                 self.setupSideMenuGestures()
             }
             
-            self.registerUserSessionsServiceNotifications()
             self.registerUserSessionsServiceNotifications()
             self.registerSessionChange()
             
             if let homeViewController = homeViewControllerWrapperViewController {
                 let versionCheckCoordinator = VersionCheckCoordinator(rootViewController: masterTabBarController,
-                                                                  bannerPresenter: homeViewController,
-                                                                  themeService: ThemeService.shared())
+                                                                      bannerPresenter: homeViewController,
+                                                                      themeService: ThemeService.shared())
                 versionCheckCoordinator.start()
                 add(childCoordinator: versionCheckCoordinator)
             }
@@ -377,9 +376,9 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
     
     private func showRoom(with roomId: String, eventId: String?, matrixSession: MXSession, completion: (() -> Void)? = nil) {
         
-        // RoomCoordinator will be presented by the split view
-        // We don't which navigation controller instance will be used
-        // Give the NavigationRouterStore instance and let it find the associated navigation controller if needed
+        // RoomCoordinator will be presented by the split view.
+        // Ass we don't know which navigation controller instance will be used,
+        // give the NavigationRouterStore instance and let it find the associated navigation controller
         let roomCoordinatorParameters = RoomCoordinatorParameters(navigationRouterStore: NavigationRouterStore.shared, session: matrixSession, roomId: roomId, eventId: eventId)
         
         self.showRoom(with: roomCoordinatorParameters, completion: completion)
diff --git a/Riot/Routers/NavigationRouter.swift b/Riot/Routers/NavigationRouter.swift
index c1fea2104..8d9761079 100755
--- a/Riot/Routers/NavigationRouter.swift
+++ b/Riot/Routers/NavigationRouter.swift
@@ -320,7 +320,7 @@ extension NavigationRouter: UINavigationControllerDelegate {
     
     func navigationController(_ navigationController: UINavigationController, willShow viewController: UIViewController, animated: Bool) {
         
-        // TODO: Try to post `NavigationRouter.willPopViewController` notification here
+        // TODO: Try to post `NavigationRouter.willPopModule` notification here
     }
     
     func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool) {