diff --git a/src/asciinema/component/local_file_server.clj b/src/asciinema/component/local_file_server.clj
index 70b6df7..eeab31d 100644
--- a/src/asciinema/component/local_file_server.clj
+++ b/src/asciinema/component/local_file_server.clj
@@ -1,6 +1,7 @@
 (ns asciinema.component.local-file-server
-  (:require [asciinema.boundary.file-server :as file-server]
-            [asciinema.boundary.file-store :as file-store]
+  (:require [asciinema.boundary
+             [file-server :as file-server]
+             [file-store :as file-store]]
             [ring.util.http-response :as response]))
 
 (defrecord LocalFileServer [file-store]
diff --git a/src/asciinema/component/s3_file_server.clj b/src/asciinema/component/s3_file_server.clj
index 5529922..2c04a39 100644
--- a/src/asciinema/component/s3_file_server.clj
+++ b/src/asciinema/component/s3_file_server.clj
@@ -1,13 +1,12 @@
 (ns asciinema.component.s3-file-server
   (:require [asciinema.boundary.file-server :as file-server]
-            [aws.sdk.s3 :as s3]
-            [clj-time.core :as time]
-            [clj-time.coerce :as timec]
+            [clj-time
+             [coerce :as timec]
+             [core :as time]]
             [ring.util.http-response :as response])
-  (:import com.amazonaws.services.s3.model.ResponseHeaderOverrides
+  (:import com.amazonaws.auth.BasicAWSCredentials
            com.amazonaws.services.s3.AmazonS3Client
-           com.amazonaws.auth.BasicAWSCredentials
-           com.amazonaws.services.s3.model.GeneratePresignedUrlRequest))
+           [com.amazonaws.services.s3.model GeneratePresignedUrlRequest ResponseHeaderOverrides]))
 
 (defn- s3-client* [cred]
   (let [credentials (BasicAWSCredentials. (:access-key cred) (:secret-key cred))]