diff --git a/ImageViewer/ViewController.swift b/ImageViewer/ViewController.swift
index 4a45d14..4da3b2a 100644
--- a/ImageViewer/ViewController.swift
+++ b/ImageViewer/ViewController.swift
@@ -714,7 +714,7 @@ class ViewController: UIViewController, UIGestureRecognizerDelegate {
             if mode == .scroll {
                 scrollingCollectionView.reloadData()
             } else {
-                setImages(path: path)
+                setImages()
             }
         } else {
             print("path not found")
@@ -1159,16 +1159,23 @@ class ViewController: UIViewController, UIGestureRecognizerDelegate {
 
         imageLoader.setActiveWindow([path])
 
-        let archiveURL = getArchiveURL(progress.v)
-        imageLoader.loadImage(archiveURL: archiveURL, filename: getImagePath(progress), scaling: scaling, screenSize: UIScreen.main.bounds.size) { [weak self] image in
+        imageLoader.loadImage(
+            archiveURL: getArchiveURL(progress.v),
+            filename: getImagePath(progress),
+            scaling: scaling,
+            screenSize: UIScreen.main.bounds.size
+        ) { [weak self] image in
             self?.imageView.image = image
         }
 
         for _ in 0 ..< preloadCount {
             newProgress = getProgressIndicesFromTurn(turn: .next, progress: newProgress)
-            let filename = getImagePath(newProgress)
-            let archiveURL = getArchiveURL(newProgress.v)
-            imageLoader.preloadImage(archiveURL: archiveURL, filename: filename, scaling: scaling, screenSize: UIScreen.main.bounds.size)
+            imageLoader.preloadImage(
+                archiveURL: getArchiveURL(newProgress.v),
+                filename: getImagePath(newProgress),
+                scaling: scaling,
+                screenSize: UIScreen.main.bounds.size
+            )
         }
 
         saveLocalState()
@@ -1291,7 +1298,7 @@ class ViewController: UIViewController, UIGestureRecognizerDelegate {
         return metadata
     }
 
-    func setImages(path _: URL) {
+    func setImages() {
         let scaling: UIView.ContentMode = mode == .scroll ? .scaleAspectFill : .scaleAspectFit
         imageLoader.loadImage(
             archiveURL: getArchiveURL(progress.v),
@@ -1307,7 +1314,7 @@ class ViewController: UIViewController, UIGestureRecognizerDelegate {
         for _ in 0 ..< preloadCount {
             newProgress = getProgressIndicesFromTurn(turn: .next, progress: newProgress)
             imageLoader.preloadImage(
-                archiveURL: getArchiveURL(progress.v),
+                archiveURL: getArchiveURL(newProgress.v),
                 filename: getImagePath(newProgress),
                 scaling: scaling,
                 screenSize: UIScreen.main.bounds.size,
@@ -1427,7 +1434,8 @@ extension ViewController: UICollectionViewDataSource, UICollectionViewDelegateFl
             imageLoader.loadImage(
               archiveURL: getArchiveURL(progress.v),
               filename: getImagePath(newProgress),
-              scaling: scaling, screenSize: UIScreen.main.bounds.size) { image in
+              scaling: scaling, screenSize: UIScreen.main.bounds.size
+            ) { image in
                 cell.imageView.image = image
             }
             return cell
@@ -1646,7 +1654,7 @@ class ImageLoader {
                 let vScaleImage = resizeImage(image, to: vScaledSize)
                 let cost = imageByteSize(vScaleImage)!
                 if scaling == .scaleAspectFit {
-                    self.portraitFitCache.setObject(vScaleImage, forKey: filename as NSString, cost: cost) 
+                    self.portraitFitCache.setObject(vScaleImage, forKey: filename as NSString, cost: cost)
                 } else if scaling == .scaleAspectFill {
                     self.portraitFillCache.setObject(vScaleImage, forKey: filename as NSString, cost: cost)
                 } else {