diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomCellLayoutUpdater.swift b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomCellLayoutUpdater.swift
index a93f91124..3fc2bf8fa 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomCellLayoutUpdater.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomCellLayoutUpdater.swift
@@ -164,7 +164,6 @@ class BubbleRoomCellLayoutUpdater: RoomCellLayoutUpdaterProtocol {
             return nil
         }
         
-        
         let bubbleHeight: CGFloat
         let bottomMargin: CGFloat = 4.0
             
diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineCellDecorator.swift b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineCellDecorator.swift
index 7e89cafe1..8451fe650 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineCellDecorator.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineCellDecorator.swift
@@ -92,7 +92,7 @@ class BubbleRoomTimelineCellDecorator: PlainRoomTimelineCellDecorator {
             reactionsView.alignment = .right
             
             // TODO: Use constants
-            var outgointLeftMargin = 80.0
+            var outgointLeftMargin: CGFloat = 80.0
             
             if cellData.containsBubbleComponentWithEncryptionBadge {
                 outgointLeftMargin += RoomBubbleCellLayout.encryptedContentLeftMargin
@@ -156,7 +156,7 @@ class BubbleRoomTimelineCellDecorator: PlainRoomTimelineCellDecorator {
         if cellData.isSenderCurrentUser {
             
             // TODO: Use constants
-            let rightMargin = 34.0
+            let rightMargin: CGFloat = 34.0
             
             leadingOrTrailingConstraint = urlPreviewView.trailingAnchor.constraint(equalTo: cellContentView.trailingAnchor, constant: -rightMargin)
         } else {