diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index 3f1bd2aae..a51723840 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -38,6 +38,7 @@ import qualified Data.List as List
 import qualified Data.List.NonEmpty as NonEmpty
 
 
+-- | Check whether the user's preference for files is inline-viewing or downloading
 downloadFiles :: (MonadHandler m, HandlerSite m ~ UniWorX) => m Bool
 downloadFiles = do
   mauth <- liftHandlerT maybeAuth
@@ -47,18 +48,22 @@ downloadFiles = do
       UserDefaultConf{..} <- getsYesod $ view _appUserDefaults
       return userDefaultDownloadFiles
 
+-- | Simply send a `File`-Value
+sendThisFile :: File -> Handler TypedContent
+sendThisFile File{..}
+  | Just fileContent' <- fileContent = do
+      ifM downloadFiles
+        (addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|])
+        (addHeader "Content-Disposition" [st|inline; filename="#{takeFileName fileTitle}"|])
+      return $ TypedContent (mimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent fileContent')
+  | otherwise = sendResponseStatus noContent204 ()
+
 -- | Serve a single file, identified through a given DB query
 serveOneFile :: DB [Entity File] -> Handler TypedContent
 serveOneFile query = do
   results <- runDB query
   case results of
-    [Entity _fileId File{fileTitle, fileContent}]
-      | Just fileContent' <- fileContent -> do
-          ifM downloadFiles
-            (addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|])
-            (addHeader "Content-Disposition" [st|inline; filename="#{takeFileName fileTitle}"|])
-          return $ TypedContent (mimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent fileContent')
-      | otherwise -> sendResponseStatus noContent204 ()
+    [Entity _fileId file] -> sendThisFile file
     [] -> notFound
     other -> do
       $logErrorS "SFileR" $ "Multiple matching files: " <> tshow other
@@ -70,19 +75,13 @@ serveSomeFiles :: Text -> DB [Entity File] -> Handler TypedContent
 serveSomeFiles archiveName query = do
   results <- runDB query
   case results of
-    [] -> notFound
-    [Entity _fileId File{fileTitle, fileContent}]
-      | Just fileContent' <- fileContent -> do
-          ifM downloadFiles
-            (addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|])
-            (addHeader "Content-Disposition" [st|inline; filename="#{takeFileName fileTitle}"|])
-          return $ TypedContent (mimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent fileContent')
-      | otherwise -> sendResponseStatus noContent204 ()
-    files -> do
+    []                    -> notFound
+    [Entity _fileId file] -> sendThisFile file
+    moreFiles -> do
       addHeader "Content-Disposition" [st|attachment; filename="#{toPathPiece archiveName}"|]
       respondSourceDB "application/zip" $ do
         let zipComment = T.encodeUtf8 archiveName
-        yieldMany files .| Conduit.map entityVal .| produceZip ZipInfo{..} .| Conduit.map toFlushBuilder
+        yieldMany moreFiles .| Conduit.map entityVal .| produceZip ZipInfo{..} .| Conduit.map toFlushBuilder
 
 
 tidFromText :: Text -> Maybe TermId