diff --git a/fitnesstrax/app/src/main.rs b/fitnesstrax/app/src/main.rs
index 921f708..b6ca965 100644
--- a/fitnesstrax/app/src/main.rs
+++ b/fitnesstrax/app/src/main.rs
@@ -25,8 +25,7 @@ mod views;
 
 use adw::prelude::*;
 use app_window::AppWindow;
-use components::ActionGroup;
-use gio::{Action, ActionEntry};
+use gio::ActionEntry;
 use std::{env, path::PathBuf};
 
 const APP_ID_DEV: &str = "com.luminescent-dreams.fitnesstrax.dev";
@@ -81,7 +80,7 @@ fn main() {
         let icon_theme = gtk::IconTheme::for_display(&gdk::Display::default().unwrap());
         icon_theme.add_resource_path(&(RESOURCE_BASE_PATH.to_owned() + "/icons/scalable/actions"));
 
-        setup_app_close_action(&adw_app);
+        setup_app_close_action(adw_app);
 
         AppWindow::new(app_id, RESOURCE_BASE_PATH, adw_app, ft_app.clone());
     });
diff --git a/fitnesstrax/core/src/lib.rs b/fitnesstrax/core/src/lib.rs
index 15f4871..007dc3f 100644
--- a/fitnesstrax/core/src/lib.rs
+++ b/fitnesstrax/core/src/lib.rs
@@ -2,7 +2,7 @@ mod legacy;
 
 mod types;
 pub use types::{
-    SetRep, SetRepActivity, Steps, TimeDistance, TimeDistanceActivity, TraxRecord, Weight,
-    DurationWorkoutActivity, DurationWorkout,
-    SET_REP_ACTIVITIES, TIME_DISTANCE_ACTIVITIES,
+    DurationWorkout, DurationWorkoutActivity, SetRep, SetRepActivity, Steps, TimeDistance,
+    TimeDistanceActivity, TraxRecord, Weight, DURATION_WORKOUT_ACTIVITIES, SET_REP_ACTIVITIES,
+    TIME_DISTANCE_ACTIVITIES,
 };