diff --git a/Nynja/Modules/Message/Interactor/MessageInteractor.swift b/Nynja/Modules/Message/Interactor/MessageInteractor.swift
index 49fb6950fd03ca3d693e48dbef7381c8caf421ab..4d016832b558252fc523de55edcb33294204105c 100644
--- a/Nynja/Modules/Message/Interactor/MessageInteractor.swift
+++ b/Nynja/Modules/Message/Interactor/MessageInteractor.swift
@@ -338,12 +338,10 @@ final class MessageInteractor: BaseInteractor, MessageInteractorInputProtocol, H
     }
 
     func currentMembersCount() -> UInt {
-        if let r = self.room, let roomId = r.id {
-            return callService.currentMembersCountForCallWithRoom(roomId)
-        }
-        
-        return 0;
+        guard let id = self.room?.id else { return 0 }
+        return callService.currentMembersCountForCallWithRoom(id)
     }
+    
     // MARK: - Fetch Data
     
     private func fetchData() {
diff --git a/Nynja/Services/NynjaCommunicatorService.swift b/Nynja/Services/NynjaCommunicatorService.swift
index 399caa465398a4780eeb7daff7732c73709123bd..e999db6a18208543287ef971ecce8db53085d86e 100644
--- a/Nynja/Services/NynjaCommunicatorService.swift
+++ b/Nynja/Services/NynjaCommunicatorService.swift
@@ -304,11 +304,8 @@ class NynjaCommunicatorService: NSObject, NynjaCommunicatorDelegate, NYNCallDele
     }
 
     func currentMembersCountForCallWithRoom(_ roomId: String) -> UInt {
-        if let call = self.nynComm.getCallManager().getCallForRunningCall(withRoom: roomId) {
-            return call.membersCount
-        }
-        
-        return 0
+        guard let call = self.nynComm.getCallManager().getCallForRunningCall(withRoom: roomId) else { return 0 }
+        return call.membersCount
     }
     
     func didChangeConferenceState(_ state: NYNCallState) {
@@ -378,12 +375,9 @@ class NynjaCommunicatorService: NSObject, NynjaCommunicatorDelegate, NYNCallDele
     }
 
     func makeMembers(contacts: [Contact], room: Room?) -> [Member] {
-        var members = [Member]()
-        for i in contacts {
-            members.append(Member(contact: i))
-        }
-
-        if let r = room, let selfMember = r.selfMember {
+        var members = contacts.map() { Member(contact: $0) }
+        
+        if let selfMember = room?.selfMember {
             members.append(selfMember)
         } else if let mySelf = getMySelf() {
             let myMember = Member(contact: mySelf)