diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/RoomDecryptorProvider.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/RoomDecryptorProvider.kt
index 6e30484d8c..7d424f56fd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/RoomDecryptorProvider.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/RoomDecryptorProvider.kt
@@ -50,7 +50,7 @@ internal class RoomDecryptorProvider @Inject constructor(
             Timber.e("## getRoomDecryptor() : null algorithm")
             return null
         }
-        if(roomId != null && roomId.isNotEmpty()) {
+        if (roomId != null && roomId.isNotEmpty()) {
             synchronized(roomDecryptors) {
                 if (!roomDecryptors.containsKey(roomId)) {
                     roomDecryptors[roomId] = HashMap()
diff --git a/vector/src/main/java/im/vector/riotredesign/core/di/ScreenScope.java b/vector/src/main/java/im/vector/riotredesign/core/di/ScreenScope.java
index d3915f7d25..ecd68a4e9c 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/di/ScreenScope.java
+++ b/vector/src/main/java/im/vector/riotredesign/core/di/ScreenScope.java
@@ -18,12 +18,12 @@ package im.vector.riotredesign.core.di;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 import javax.inject.Scope;
 
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 @Scope
 @Documented
-@Retention(RUNTIME)
-public @interface ScreenScope {}
\ No newline at end of file
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ScreenScope {
+}
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuViewModel.kt
index fcd73e824a..9aa14e6a32 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuViewModel.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuViewModel.kt
@@ -103,7 +103,7 @@ class MessageMenuViewModel @AssistedInject constructor(@Assisted initialState: M
 //                                SimpleAction(ACTION_DELETE, R.string.delete, R.drawable.ic_delete, event.root.eventId)
             )
         } else {
-            ArrayList<SimpleAction>().apply {
+            arrayListOf<SimpleAction>().apply {
 
                 if (event.sendState == SendState.SENDING) {
                     //TODO add cancel?
diff --git a/vector/src/main/java/im/vector/riotredesign/features/invite/VectorInviteView.kt b/vector/src/main/java/im/vector/riotredesign/features/invite/VectorInviteView.kt
index ada994dfad..7777264e1c 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/invite/VectorInviteView.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/invite/VectorInviteView.kt
@@ -46,7 +46,7 @@ class VectorInviteView @JvmOverloads constructor(context: Context, attrs: Attrib
     var callback: Callback? = null
 
     init {
-        if(context is HasScreenInjector){
+        if (context is HasScreenInjector){
             context.injector().inject(this)
         }
         View.inflate(context, R.layout.vector_invite_view, this)
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestBingRulesSettings.kt b/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestBingRulesSettings.kt
index 13187f6a1f..41ff19f517 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestBingRulesSettings.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestBingRulesSettings.kt
@@ -24,7 +24,8 @@ import im.vector.riotredesign.features.notifications.NotificationAction
 import javax.inject.Inject
 
 class TestBingRulesSettings @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
-                                                private val stringProvider: StringProvider) : TroubleshootTest(R.string.settings_troubleshoot_test_bing_settings_title) {
+                                                private val stringProvider: StringProvider)
+    : TroubleshootTest(R.string.settings_troubleshoot_test_bing_settings_title) {
 
     private val testedRules =
             listOf(RuleIds.RULE_ID_CONTAIN_DISPLAY_NAME,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestDeviceSettings.kt b/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestDeviceSettings.kt
index cfafedc771..dd783f621f 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestDeviceSettings.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestDeviceSettings.kt
@@ -25,7 +25,8 @@ import javax.inject.Inject
  * Checks if notifications are enable in the system settings for this app.
  */
 class TestDeviceSettings @Inject constructor(private val context: AppCompatActivity,
-                                             private val stringProvider: StringProvider) : TroubleshootTest(R.string.settings_troubleshoot_test_device_settings_title) {
+                                             private val stringProvider: StringProvider)
+    : TroubleshootTest(R.string.settings_troubleshoot_test_device_settings_title) {
 
     override fun perform() {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestSystemSettings.kt b/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestSystemSettings.kt
index 9d2ebabc98..9d336f9d6f 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestSystemSettings.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestSystemSettings.kt
@@ -26,7 +26,8 @@ import javax.inject.Inject
  * Checks if notifications are enable in the system settings for this app.
  */
 class TestSystemSettings @Inject constructor(private val context: AppCompatActivity,
-                                             private val stringProvider: StringProvider) : TroubleshootTest(R.string.settings_troubleshoot_test_system_settings_title) {
+                                             private val stringProvider: StringProvider)
+    : TroubleshootTest(R.string.settings_troubleshoot_test_system_settings_title) {
 
     override fun perform() {
         if (NotificationManagerCompat.from(context).areNotificationsEnabled()) {