diff --git a/iphone/Maps/Core/iCloud/CloudDirectoryMonitor.swift b/iphone/Maps/Core/iCloud/CloudDirectoryMonitor.swift
index d2516fac52..565bd3b420 100644
--- a/iphone/Maps/Core/iCloud/CloudDirectoryMonitor.swift
+++ b/iphone/Maps/Core/iCloud/CloudDirectoryMonitor.swift
@@ -159,6 +159,8 @@ private extension iCloudDocumentsMonitor {
     LOG(.debug, "Query did finish gathering")
     do {
       let currentContents = try Self.getCurrentContents(notification)
+      LOG(.info, "Cloud contents (\(currentContents.count)):")
+      currentContents.forEach { LOG(.info, $0.shortDebugDescription) }
       delegate?.didFinishGathering(currentContents)
     } catch {
       delegate?.didReceiveCloudMonitorError(error)
@@ -176,10 +178,12 @@ private extension iCloudDocumentsMonitor {
       This unnecessary updated should be skipped. */
       if changedContents != previouslyChangedContents {
         previouslyChangedContents = changedContents
-        LOG(.info, "Added to the cloud content: \n\(changedContents.added.shortDebugDescription)")
-        LOG(.info, "Updated in the cloud content: \n\(changedContents.updated.shortDebugDescription)")
-        LOG(.info, "Removed from the cloud content: \n\(changedContents.removed.shortDebugDescription)")
         let currentContents = try Self.getCurrentContents(notification)
+        LOG(.info, "Cloud contents (\(currentContents.count)):")
+        currentContents.forEach { LOG(.info, $0.shortDebugDescription) }
+        LOG(.info, "Added to the cloud content (\(changedContents.added.count)): \n\(changedContents.added.shortDebugDescription)")
+        LOG(.info, "Updated in the cloud content (\(changedContents.updated.count)): \n\(changedContents.updated.shortDebugDescription)")
+        LOG(.info, "Removed from the cloud content (\(changedContents.removed.count)): \n\(changedContents.removed.shortDebugDescription)")
         delegate?.didUpdate(currentContents, changedContents)
       }
     } catch {
diff --git a/iphone/Maps/Core/iCloud/LocalDirectoryMonitor.swift b/iphone/Maps/Core/iCloud/LocalDirectoryMonitor.swift
index cd2ec94f86..9666fe39c0 100644
--- a/iphone/Maps/Core/iCloud/LocalDirectoryMonitor.swift
+++ b/iphone/Maps/Core/iCloud/LocalDirectoryMonitor.swift
@@ -150,26 +150,31 @@ final class FileSystemDispatchSourceMonitor: LocalDirectoryMonitor {
         .contentsOfDirectory(at: directory, includingPropertiesForKeys: [.contentModificationDateKey], options: [.skipsHiddenFiles])
         .filter { $0.pathExtension == fileType.fileExtension }
       let currentContents = try files.map { try LocalMetadataItem(fileUrl: $0) }
-
-      if !didFinishGatheringIsCalled {
-        LOG(.debug, "didFinishGathering will be called")
-        didFinishGatheringIsCalled = true
-        contents = currentContents
-        delegate?.didFinishGathering(currentContents)
-      } else {
-        LOG(.debug, "didUpdate will be called")
-        let changedContents = Self.getChangedContents(oldContents: contents, newContents: currentContents)
-        contents = currentContents
-        LOG(.info, "Added to the local content: \n\(changedContents.added.shortDebugDescription)")
-        LOG(.info, "Updated in the local content: \n\(changedContents.updated.shortDebugDescription)")
-        LOG(.info, "Removed from the local content: \n\(changedContents.removed.shortDebugDescription)")
-        delegate?.didUpdate(currentContents, changedContents)
-      }
+      didFinishGatheringIsCalled ? didUpdate(currentContents) : didFinishGathering(currentContents)
     } catch {
       delegate?.didReceiveLocalMonitorError(error)
     }
   }
 
+  private func didFinishGathering(_ currentContents: LocalContents) {
+    didFinishGatheringIsCalled = true
+    contents = currentContents
+    LOG(.info, "Local contents (\(currentContents.count)):")
+    currentContents.forEach { LOG(.info, $0.shortDebugDescription) }
+    delegate?.didFinishGathering(currentContents)
+  }
+
+  private func didUpdate(_ currentContents: LocalContents) {
+    let changedContents = Self.getChangedContents(oldContents: contents, newContents: currentContents)
+    contents = currentContents
+    LOG(.info, "Local contents (\(currentContents.count)):")
+    currentContents.forEach { LOG(.info, $0.shortDebugDescription) }
+    LOG(.info, "Added to the local content (\(changedContents.added.count)): \n\(changedContents.added.shortDebugDescription)")
+    LOG(.info, "Updated in the local content (\(changedContents.updated.count)): \n\(changedContents.updated.shortDebugDescription)")
+    LOG(.info, "Removed from the local content (\(changedContents.removed.count)): \n\(changedContents.removed.shortDebugDescription)")
+    delegate?.didUpdate(currentContents, changedContents)
+  }
+
   private static func getChangedContents(oldContents: LocalContents, newContents: LocalContents) -> LocalContentsUpdate {
     let added = newContents.filter { !oldContents.containsByName($0) }
     let updated = newContents.reduce(into: LocalContents()) { partialResult, newItem in
diff --git a/iphone/Maps/Core/iCloud/MetadataItem.swift b/iphone/Maps/Core/iCloud/MetadataItem.swift
index 7302437721..403993547d 100644
--- a/iphone/Maps/Core/iCloud/MetadataItem.swift
+++ b/iphone/Maps/Core/iCloud/MetadataItem.swift
@@ -86,7 +86,7 @@ extension CloudMetadataItem {
 
 extension MetadataItem {
   var shortDebugDescription: String {
-    "\(fileName), lastModified: \(lastModificationDate)"
+    "fileName: \(fileName), lastModified: \(lastModificationDate)"
   }
 }
 
diff --git a/iphone/Maps/Core/iCloud/SynchronizaionManager.swift b/iphone/Maps/Core/iCloud/SynchronizaionManager.swift
index 899d301238..6555f7e7ef 100644
--- a/iphone/Maps/Core/iCloud/SynchronizaionManager.swift
+++ b/iphone/Maps/Core/iCloud/SynchronizaionManager.swift
@@ -106,7 +106,6 @@ final class iCloudSynchronizaionManager: NSObject {
 private extension iCloudSynchronizaionManager {
   // MARK: - Synchronization Lifecycle
   func startSynchronization() {
-    LOG(.info, "Start synchronization...")
     switch cloudDirectoryMonitor.state {
     case .started:
       LOG(.debug, "Synchronization is already started")
@@ -125,10 +124,10 @@ private extension iCloudSynchronizaionManager {
             case .failure(let error):
               self.processError(error)
             case .success(let localDirectoryUrl):
+              LOG(.info, "Start synchronization")
               self.fileWriter = SynchronizationFileWriter(fileManager: self.fileManager,
                                                           localDirectoryUrl: localDirectoryUrl,
                                                           cloudDirectoryUrl: cloudDirectoryUrl)
-              LOG(.debug, "Synchronization is started successfully")
             }
           }
         }
diff --git a/iphone/Maps/Core/iCloud/SynchronizationStateResolver.swift b/iphone/Maps/Core/iCloud/SynchronizationStateResolver.swift
index d2ba2bc9b5..02c834e9f3 100644
--- a/iphone/Maps/Core/iCloud/SynchronizationStateResolver.swift
+++ b/iphone/Maps/Core/iCloud/SynchronizationStateResolver.swift
@@ -71,11 +71,7 @@ final class iCloudSynchronizationStateResolver: SynchronizationStateResolver {
       outgoingEvents = resolveDidUpdateCloudContents(update)
     }
 
-    LOG(.info, "Cloud contents: \(currentCloudContents.count)")
-    currentCloudContents.sorted(by: { $0.fileName < $1.fileName }).forEach { LOG(.info, $0.shortDebugDescription) }
-    LOG(.info, "Local contents: \(currentLocalContents.count)")
-    currentLocalContents.sorted(by: { $0.fileName < $1.fileName }).forEach { LOG(.info, $0.shortDebugDescription) }
-    LOG(.info, "Events to process: \(outgoingEvents.count)")
+    LOG(.info, "Events to process (\(outgoingEvents.count)):")
     outgoingEvents.forEach { LOG(.info, $0) }
 
     return outgoingEvents