diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/SendEventWorker.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/SendEventWorker.kt
index 51c36afd61..69d288a932 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/SendEventWorker.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/SendEventWorker.kt
@@ -21,7 +21,6 @@ import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
 import im.vector.matrix.android.api.failure.shouldBeRetried
-import im.vector.matrix.android.api.session.events.model.Content
 import im.vector.matrix.android.api.session.events.model.Event
 import im.vector.matrix.android.api.session.room.send.SendState
 import im.vector.matrix.android.internal.network.executeRequest
diff --git a/vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt
index 57b76bcfcc..5c680167d0 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt
@@ -360,5 +360,4 @@ interface FragmentModule {
     @IntoMap
     @FragmentKey(IncomingShareFragment::class)
     fun bindIncomingShareFragment(fragment: IncomingShareFragment): Fragment
-
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewAction.kt b/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewAction.kt
index a016b71fab..5acc59b035 100644
--- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewAction.kt
+++ b/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewAction.kt
@@ -23,6 +23,4 @@ sealed class AttachmentsPreviewAction : VectorViewModelAction {
     object RemoveCurrentAttachment : AttachmentsPreviewAction()
     data class SetCurrentAttachment(val index: Int): AttachmentsPreviewAction()
     data class UpdatePathOfCurrentAttachment(val newPath: String): AttachmentsPreviewAction()
-
-
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewFragment.kt b/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewFragment.kt
index ee0755c6ee..d05dcc5593 100644
--- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewFragment.kt
@@ -188,6 +188,7 @@ class AttachmentsPreviewFragment @Inject constructor(
                                     // Status bar color (pb in dark mode, icon of the status bar are dark)
                                     setStatusBarColor(colorProvider.getColorFromAttribute(R.attr.riotx_header_panel_background))
                                     // Known issue: there is still orange color used by the lib
+                                    // https://github.com/Yalantis/uCrop/issues/602
                                     setActiveControlsWidgetColor(colorProvider.getColor(R.color.riotx_accent))
                                     // Hide the logo (does not work)
                                     setLogoColor(Color.TRANSPARENT)
@@ -203,11 +204,14 @@ class AttachmentsPreviewFragment @Inject constructor(
         attachmentMiniaturePreviewController.callback = this
 
         attachmentPreviewerBigList.layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
-        attachmentPreviewerBigList.attachSnapHelperWithListener(PagerSnapHelper(), SnapOnScrollListener.Behavior.NOTIFY_ON_SCROLL_STATE_IDLE, object : OnSnapPositionChangeListener {
-            override fun onSnapPositionChange(position: Int) {
-                viewModel.handle(AttachmentsPreviewAction.SetCurrentAttachment(position))
-            }
-        })
+        attachmentPreviewerBigList.attachSnapHelperWithListener(
+                PagerSnapHelper(),
+                SnapOnScrollListener.Behavior.NOTIFY_ON_SCROLL_STATE_IDLE,
+                object : OnSnapPositionChangeListener {
+                    override fun onSnapPositionChange(position: Int) {
+                        viewModel.handle(AttachmentsPreviewAction.SetCurrentAttachment(position))
+                    }
+                })
         attachmentPreviewerBigList.setHasFixedSize(true)
         attachmentPreviewerBigList.adapter = attachmentBigPreviewController.adapter
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAction.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAction.kt
index 9634bf6a25..9db7374169 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAction.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAction.kt
@@ -19,7 +19,6 @@ package im.vector.riotx.features.home.room.list
 import im.vector.matrix.android.api.session.room.model.RoomSummary
 import im.vector.matrix.android.api.session.room.notification.RoomNotificationState
 import im.vector.riotx.core.platform.VectorViewModelAction
-import im.vector.riotx.features.share.SharedData
 
 sealed class RoomListAction : VectorViewModelAction {
     data class SelectRoom(val roomSummary: RoomSummary) : RoomListAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt
index 2bfbc6aa8e..455365602f 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt
@@ -28,7 +28,6 @@ import im.vector.matrix.android.api.session.room.model.tag.RoomTag
 import im.vector.riotx.core.extensions.exhaustive
 import im.vector.riotx.core.platform.VectorViewModel
 import im.vector.riotx.core.utils.DataSource
-import im.vector.riotx.features.share.SharedData
 import io.reactivex.schedulers.Schedulers
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt
index da64c87fb7..c9724bf971 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt
@@ -22,7 +22,6 @@ import im.vector.matrix.android.api.session.room.model.Membership
 import im.vector.matrix.android.api.session.room.model.RoomSummary
 import im.vector.riotx.R
 import im.vector.riotx.core.epoxy.helpFooterItem
-import im.vector.riotx.core.epoxy.noResultItem
 import im.vector.riotx.core.resources.StringProvider
 import im.vector.riotx.core.resources.UserPreferencesProvider
 import im.vector.riotx.features.home.RoomListDisplayMode
@@ -161,7 +160,13 @@ class RoomSummaryController @Inject constructor(private val stringProvider: Stri
                                 selectedRoomIds: Set<String>) {
         summaries.forEach { roomSummary ->
             roomSummaryItemFactory
-                    .create(roomSummary, joiningRoomsIds, joiningErrorRoomsIds, rejectingRoomsIds, rejectingErrorRoomsIds,selectedRoomIds, listener)
+                    .create(roomSummary,
+                            joiningRoomsIds,
+                            joiningErrorRoomsIds,
+                            rejectingRoomsIds,
+                            rejectingErrorRoomsIds,
+                            selectedRoomIds,
+                            listener)
                     .addTo(this)
         }
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItem.kt
index 3d4ce6b7ff..f91b3356d0 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItem.kt
@@ -57,7 +57,7 @@ abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>() {
         super.bind(holder)
         holder.rootView.setOnClickListener(itemClickListener)
         holder.rootView.setOnLongClickListener {
-            it.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+            it.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
             itemLongClickListener?.onLongClick(it) ?: false
         }
         holder.titleView.text = matrixItem.getBestName()
diff --git a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareActivity.kt b/vector/src/main/java/im/vector/riotx/features/share/IncomingShareActivity.kt
index 61599a61d8..5948ea089d 100644
--- a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/share/IncomingShareActivity.kt
@@ -36,4 +36,3 @@ class IncomingShareActivity : VectorBaseActivity(), ToolbarConfigurable {
         configureToolbar(toolbar, displayBack = false)
     }
 }
-
diff --git a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewState.kt b/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewState.kt
index 0116d59348..71b416ef7e 100644
--- a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewState.kt
+++ b/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewState.kt
@@ -28,5 +28,3 @@ data class IncomingShareViewState(
         val selectedRoomIds: Set<String> = emptySet(),
         val isInMultiSelectionMode: Boolean = false
 ) : MvRxState
-
-