diff --git a/src/db.rs b/src/db.rs
index f50c9c65d45d9943b3b826d2ed77b48c80b91d99..2721b98b965349bfa5ad3e64022a8b942af62925 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -1,6 +1,6 @@
 use std::{collections::HashMap, hash::Hash, time::SystemTime};
 
-use sqlx::{sqlite::SqliteQueryResult, Pool, Sqlite, query};
+use sqlx::{query, sqlite::SqliteQueryResult, Pool, Sqlite};
 
 // This struct is used to store values for metrics file stats.
 pub struct FileMetric {
@@ -8,7 +8,7 @@ pub struct FileMetric {
     pub filesize: i64,
     pub filetype: String,
     pub views: i64,
-    pub expiry: i64
+    pub expiry: i64,
 }
 
 // Adding a file to the database
@@ -337,8 +337,11 @@ pub async fn total_alive_filetype(sqlconn: &Pool<Sqlite>) -> Option<HashMap<Stri
         None
     } else {
         for row in result.unwrap() {
-            filecount.insert(row.filetype.expect("Something went very wrong while getting the alive filetype count."),
-                 row.filecount);
+            filecount.insert(
+                row.filetype
+                    .expect("Something went very wrong while getting the alive filetype count."),
+                row.filecount.try_into().unwrap(),
+            );
         }
         Some(filecount)
     }
@@ -364,8 +367,11 @@ pub async fn total_dead_filetype(sqlconn: &Pool<Sqlite>) -> Option<HashMap<Strin
         None
     } else {
         for row in result.unwrap() {
-            filecount.insert(row.filetype.expect("Something went very wrong while getting the dead filetype count."),
-                 row.filecount);
+            filecount.insert(
+                row.filetype
+                    .expect("Something went very wrong while getting the dead filetype count."),
+                row.filecount.into(),
+            );
         }
         Some(filecount)
     }
@@ -391,13 +397,16 @@ pub async fn get_dead_fileviews(sqlconn: &Pool<Sqlite>) -> Option<HashMap<String
         None
     } else {
         for row in result.unwrap() {
-            deadviews.insert(row.filetype.expect("Something went very wrong while getting the dead filetype views."),
-                row.views.expect("Something went very wrong while getting the dead views"));
+            deadviews.insert(
+                row.filetype
+                    .expect("Something went very wrong while getting the dead filetype views."),
+                row.views
+                    .expect("Something went very wrong while getting the dead views"),
+            );
         }
         tracing::debug!("deadviews: {:?}", deadviews);
         Some(deadviews)
     }
-
 }
 
 // This function queries the db for the filesize for /each/ alive file. - We won't need to do this for dead files
@@ -427,7 +436,7 @@ pub async fn get_filemetrics(sqlconn: &Pool<Sqlite>) -> Option<Vec<FileMetric>>
                 filetype: row.filetype.unwrap(),
                 filesize: row.filesize,
                 views: row.views.unwrap(),
-                expiry: row.expiry
+                expiry: row.expiry,
             };
             // Then add the struct to the Vec
             filevec.push(file);
@@ -435,4 +444,4 @@ pub async fn get_filemetrics(sqlconn: &Pool<Sqlite>) -> Option<Vec<FileMetric>>
         // Return vec or return nothing.
         Some(filevec)
     }
-}
\ No newline at end of file
+}
diff --git a/src/main.rs b/src/main.rs
index feda152b9336c3064e24c2726a13044538e8a608..513d1b0a885b208bfa82552f1217bfdf0329d9b7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -525,12 +525,7 @@ async fn serve_metrics(req: &mut Request, res: &mut Response) {
         // Add the file to the rendered String :)
         rendered = format!(
             "{}file{{filename={} filesize={} filetype={} views={} expiry={}}}\n",
-            rendered,
-            file.filename,
-            file.filesize,
-            file.filetype,
-            file.views,
-            file.expiry,
+            rendered, file.filename, file.filesize, file.filetype, file.views, file.expiry,
         );
     }