diff --git a/Riot/AppDelegate.h b/Riot/AppDelegate.h
index 24bc137c0..58929e7f3 100644
--- a/Riot/AppDelegate.h
+++ b/Riot/AppDelegate.h
@@ -1,5 +1,6 @@
 /*
  Copyright 2014 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
  
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -24,6 +25,10 @@
 
 #import "MasterTabBarController.h"
 
+#import "RageShakeManager.h"
+
+#import "RiotDesignValues.h"
+
 #pragma mark - Notifications
 /**
  Posted when the user taps the clock status bar.
diff --git a/Riot/AppDelegate.m b/Riot/AppDelegate.m
index 5a9b4dc87..e82356d6f 100644
--- a/Riot/AppDelegate.m
+++ b/Riot/AppDelegate.m
@@ -28,8 +28,6 @@
 #import "SettingsViewController.h"
 #import "ContactDetailsViewController.h"
 
-#import "RageShakeManager.h"
-
 #import "NSBundle+MatrixKit.h"
 #import "MatrixSDK/MatrixSDK.h"
 
@@ -52,8 +50,6 @@
 
 #include <MatrixSDK/MXJingleCallStack.h>
 
-#import "RiotDesignValues.h"
-
 #define CALL_STATUS_BAR_HEIGHT 44
 
 #define MAKE_STRING(x) #x
diff --git a/Riot/Model/RoomList/RecentsDataSource.m b/Riot/Model/RoomList/RecentsDataSource.m
index 78f13827e..f59c03073 100644
--- a/Riot/Model/RoomList/RecentsDataSource.m
+++ b/Riot/Model/RoomList/RecentsDataSource.m
@@ -276,7 +276,6 @@
         {
             // Add shrink button
             UIButton *shrinkButton = [UIButton buttonWithType:UIButtonTypeCustom];
-            CGRect frame = sectionHeader.frame;
             frame.origin.x = frame.origin.y = 0;
             shrinkButton.frame = frame;
             shrinkButton.backgroundColor = [UIColor clearColor];
diff --git a/Riot/Model/RoomList/UnifiedSearchRecentsDataSource.m b/Riot/Model/RoomList/UnifiedSearchRecentsDataSource.m
index 5ab2c1f8c..ef8b70e74 100644
--- a/Riot/Model/RoomList/UnifiedSearchRecentsDataSource.m
+++ b/Riot/Model/RoomList/UnifiedSearchRecentsDataSource.m
@@ -147,7 +147,6 @@
             sectionHeader.backgroundColor = kRiotColorLightGrey;
             
             // Add label
-            frame = sectionHeader.frame;
             frame.origin.x = 20;
             frame.origin.y = 5;
             frame.size.width = sectionHeader.frame.size.width - 10;
diff --git a/Riot/ViewController/AttachmentsViewController.m b/Riot/ViewController/AttachmentsViewController.m
index d40d86ead..658edd469 100644
--- a/Riot/ViewController/AttachmentsViewController.m
+++ b/Riot/ViewController/AttachmentsViewController.m
@@ -19,10 +19,6 @@
 
 #import "AppDelegate.h"
 
-#import "RageShakeManager.h"
-
-#import "RiotDesignValues.h"
-
 @implementation AttachmentsViewController
 
 #pragma mark -
diff --git a/Riot/ViewController/AuthenticationViewController.m b/Riot/ViewController/AuthenticationViewController.m
index a14f0b953..ba7a9819f 100644
--- a/Riot/ViewController/AuthenticationViewController.m
+++ b/Riot/ViewController/AuthenticationViewController.m
@@ -22,10 +22,6 @@
 #import "AuthInputsView.h"
 #import "ForgotPasswordInputsView.h"
 
-#import "RageShakeManager.h"
-
-#import "RiotDesignValues.h"
-
 @interface AuthenticationViewController ()
 {
     /**
diff --git a/Riot/ViewController/CallViewController.m b/Riot/ViewController/CallViewController.m
index 07380eb21..8075d22ac 100644
--- a/Riot/ViewController/CallViewController.m
+++ b/Riot/ViewController/CallViewController.m
@@ -19,10 +19,7 @@
 
 #import "AppDelegate.h"
 
-#import "RageShakeManager.h"
-
 #import "AvatarGenerator.h"
-#import "RiotDesignValues.h"
 
 #import "MXRoom+Riot.h"
 
diff --git a/Riot/ViewController/ContactDetailsViewController.m b/Riot/ViewController/ContactDetailsViewController.m
index 2c236b181..2e349bb89 100644
--- a/Riot/ViewController/ContactDetailsViewController.m
+++ b/Riot/ViewController/ContactDetailsViewController.m
@@ -21,10 +21,6 @@
 
 #import "RoomMemberTitleView.h"
 
-#import "RiotDesignValues.h"
-
-#import "RageShakeManager.h"
-
 #import "AvatarGenerator.h"
 #import "Tools.h"
 
diff --git a/Riot/ViewController/CountryPickerViewController.m b/Riot/ViewController/CountryPickerViewController.m
index 1eb600692..87237af0c 100644
--- a/Riot/ViewController/CountryPickerViewController.m
+++ b/Riot/ViewController/CountryPickerViewController.m
@@ -18,10 +18,6 @@
 
 #import "AppDelegate.h"
 
-#import "RiotDesignValues.h"
-
-#import "RageShakeManager.h"
-
 @implementation CountryPickerViewController
 
 - (void)finalizeInit
diff --git a/Riot/ViewController/DirectoryViewController.m b/Riot/ViewController/DirectoryViewController.m
index 88cd0a89c..57f7053b7 100644
--- a/Riot/ViewController/DirectoryViewController.m
+++ b/Riot/ViewController/DirectoryViewController.m
@@ -21,10 +21,6 @@
 
 #import "AppDelegate.h"
 
-#import "RiotDesignValues.h"
-
-#import "RageShakeManager.h"
-
 @interface DirectoryViewController ()
 {
     PublicRoomsDirectoryDataSource *dataSource;
diff --git a/Riot/ViewController/HomeFilesSearchViewController.m b/Riot/ViewController/HomeFilesSearchViewController.m
index fb0e313a8..7d08185b9 100644
--- a/Riot/ViewController/HomeFilesSearchViewController.m
+++ b/Riot/ViewController/HomeFilesSearchViewController.m
@@ -26,10 +26,6 @@
 
 #import "EventFormatter.h"
 
-#import "RiotDesignValues.h"
-
-#import "RageShakeManager.h"
-
 @implementation HomeFilesSearchViewController
 
 - (void)finalizeInit
diff --git a/Riot/ViewController/HomeMessagesSearchViewController.m b/Riot/ViewController/HomeMessagesSearchViewController.m
index 9a8d67d51..2f6049091 100644
--- a/Riot/ViewController/HomeMessagesSearchViewController.m
+++ b/Riot/ViewController/HomeMessagesSearchViewController.m
@@ -30,10 +30,6 @@
 
 #import "EventFormatter.h"
 
-#import "RiotDesignValues.h"
-
-#import "RageShakeManager.h"
-
 @implementation HomeMessagesSearchViewController
 
 - (void)finalizeInit
diff --git a/Riot/ViewController/MediaAlbumContentViewController.m b/Riot/ViewController/MediaAlbumContentViewController.m
index 2917186f3..e7ae70b28 100644
--- a/Riot/ViewController/MediaAlbumContentViewController.m
+++ b/Riot/ViewController/MediaAlbumContentViewController.m
@@ -19,10 +19,6 @@
 
 #import "AppDelegate.h"
 
-#import "RiotDesignValues.h"
-
-#import "RageShakeManager.h"
-
 #import <MobileCoreServices/MobileCoreServices.h>
 
 @interface MediaAlbumContentViewController ()
diff --git a/Riot/ViewController/MediaPickerViewController.m b/Riot/ViewController/MediaPickerViewController.m
index 6cf0bf0b6..db8efdc67 100644
--- a/Riot/ViewController/MediaPickerViewController.m
+++ b/Riot/ViewController/MediaPickerViewController.m
@@ -29,10 +29,6 @@
 
 #import "MediaAlbumTableCell.h"
 
-#import "RiotDesignValues.h"
-
-#import "RageShakeManager.h"
-
 static void *CapturingStillImageContext = &CapturingStillImageContext;
 static void *RecordingContext = &RecordingContext;
 
diff --git a/Riot/ViewController/RecentsViewController.h b/Riot/ViewController/RecentsViewController.h
index b9f7317c5..642c21960 100644
--- a/Riot/ViewController/RecentsViewController.h
+++ b/Riot/ViewController/RecentsViewController.h
@@ -1,5 +1,6 @@
 /*
  Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
  
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -44,7 +45,7 @@
 /**
  Refresh the cell selection in the table.
 
- This must be done accordingly to the currently selected room in the parent HomeViewController.
+ This must be done accordingly to the currently selected room in the master tabbar of the application.
 
  @param forceVisible if YES and if the corresponding cell is not visible, scroll the table view to make it visible.
  */
diff --git a/Riot/ViewController/RecentsViewController.m b/Riot/ViewController/RecentsViewController.m
index 26e2f5bdb..e74f0507c 100644
--- a/Riot/ViewController/RecentsViewController.m
+++ b/Riot/ViewController/RecentsViewController.m
@@ -21,16 +21,12 @@
 
 #import "UnifiedSearchViewController.h"
 
-#import "RageShakeManager.h"
-
 #import "MXRoom+Riot.h"
 
 #import "NSBundle+MatrixKit.h"
 
 #import "RoomViewController.h"
 
-#import "RiotDesignValues.h"
-
 #import "InviteRecentTableViewCell.h"
 #import "DirectoryRecentTableViewCell.h"
 #import "RoomIdOrAliasTableViewCell.h"
@@ -418,7 +414,7 @@
     }
 }
 
-#pragma mark - swipe actions
+#pragma mark - Swipe actions
 
 - (NSArray *)tableView:(UITableView *)tableView editActionsForRowAtIndexPath:(NSIndexPath *)indexPath
 {
@@ -960,7 +956,7 @@
 
 - (void)addRoomCreationButton
 {
-    // Add blur mask programatically
+    // Add blur mask programmatically
     tableViewMaskLayer = [CAGradientLayer layer];
     
     CGColorRef opaqueWhiteColor = [UIColor colorWithWhite:1.0 alpha:1.0].CGColor;
diff --git a/Riot/ViewController/RoomFilesSearchViewController.m b/Riot/ViewController/RoomFilesSearchViewController.m
index 8aa2244e2..fa25e3a5b 100644
--- a/Riot/ViewController/RoomFilesSearchViewController.m
+++ b/Riot/ViewController/RoomFilesSearchViewController.m
@@ -24,10 +24,6 @@
 #import "FilesSearchCellData.h"
 #import "FilesSearchTableViewCell.h"
 
-#import "RiotDesignValues.h"
-
-#import "RageShakeManager.h"
-
 #import "AppDelegate.h"
 
 @interface RoomFilesSearchViewController ()
diff --git a/Riot/ViewController/RoomFilesViewController.m b/Riot/ViewController/RoomFilesViewController.m
index 32d2c23ad..d602b906b 100644
--- a/Riot/ViewController/RoomFilesViewController.m
+++ b/Riot/ViewController/RoomFilesViewController.m
@@ -21,10 +21,6 @@
 
 #import "AppDelegate.h"
 
-#import "RiotDesignValues.h"
-
-#import "RageShakeManager.h"
-
 #import "AttachmentsViewController.h"
 
 @implementation RoomFilesViewController
diff --git a/Riot/ViewController/RoomMemberDetailsViewController.m b/Riot/ViewController/RoomMemberDetailsViewController.m
index 5f60d35fb..0db8f2965 100644
--- a/Riot/ViewController/RoomMemberDetailsViewController.m
+++ b/Riot/ViewController/RoomMemberDetailsViewController.m
@@ -21,10 +21,6 @@
 
 #import "RoomMemberTitleView.h"
 
-#import "RiotDesignValues.h"
-
-#import "RageShakeManager.h"
-
 #import "AvatarGenerator.h"
 #import "Tools.h"
 
diff --git a/Riot/ViewController/RoomMessagesSearchViewController.m b/Riot/ViewController/RoomMessagesSearchViewController.m
index 298ae5785..fd08d6521 100644
--- a/Riot/ViewController/RoomMessagesSearchViewController.m
+++ b/Riot/ViewController/RoomMessagesSearchViewController.m
@@ -26,10 +26,6 @@
 #import "RoomIncomingAttachmentBubbleCell.h"
 #import "RoomIncomingTextMsgBubbleCell.h"
 
-#import "RiotDesignValues.h"
-
-#import "RageShakeManager.h"
-
 #import "AppDelegate.h"
 
 @interface RoomMessagesSearchViewController ()
diff --git a/Riot/ViewController/RoomSettingsViewController.m b/Riot/ViewController/RoomSettingsViewController.m
index 8408a7c0b..abccffe11 100644
--- a/Riot/ViewController/RoomSettingsViewController.m
+++ b/Riot/ViewController/RoomSettingsViewController.m
@@ -22,10 +22,6 @@
 
 #import "SegmentedViewController.h"
 
-#import "RageShakeManager.h"
-
-#import "RiotDesignValues.h"
-
 #import "AvatarGenerator.h"
 #import "Tools.h"
 
diff --git a/Riot/ViewController/RoomViewController.m b/Riot/ViewController/RoomViewController.m
index a9a969bd9..f2c9d6760 100644
--- a/Riot/ViewController/RoomViewController.m
+++ b/Riot/ViewController/RoomViewController.m
@@ -21,10 +21,6 @@
 
 #import "AppDelegate.h"
 
-#import "RiotDesignValues.h"
-
-#import "RageShakeManager.h"
-
 #import "RoomInputToolbarView.h"
 
 #import "RoomActivitiesView.h"
@@ -89,8 +85,6 @@
 #import "AvatarGenerator.h"
 #import "Tools.h"
 
-#import "RiotDesignValues.h"
-
 #import "GBDeviceInfo_iOS.h"
 
 #import "RoomEncryptedDataBubbleCell.h"
diff --git a/Riot/ViewController/SegmentedViewController.m b/Riot/ViewController/SegmentedViewController.m
index 97e79c474..f203a094b 100644
--- a/Riot/ViewController/SegmentedViewController.m
+++ b/Riot/ViewController/SegmentedViewController.m
@@ -17,9 +17,7 @@
 
 #import "SegmentedViewController.h"
 
-#import "RiotDesignValues.h"
-
-#import "RageShakeManager.h"
+#import "AppDelegate.h"
 
 @interface SegmentedViewController ()
 {
diff --git a/Riot/ViewController/SettingsViewController.m b/Riot/ViewController/SettingsViewController.m
index d1563ac54..02ec9ae9a 100644
--- a/Riot/ViewController/SettingsViewController.m
+++ b/Riot/ViewController/SettingsViewController.m
@@ -17,12 +17,8 @@
 
 #import "SettingsViewController.h"
 
-#import "RageShakeManager.h"
-
 #import "AppDelegate.h"
 
-#import "RiotDesignValues.h"
-
 #import "AvatarGenerator.h"
 
 #import <Photos/Photos.h>