diff --git a/src/ag-settings.c b/src/ag-settings.c
index b19f281..f73307a 100644
--- a/src/ag-settings.c
+++ b/src/ag-settings.c
@@ -15,18 +15,19 @@ G_DEFINE_TYPE_WITH_PRIVATE(AgSettings, ag_settings, G_TYPE_OBJECT);
 static void
 ag_settings_init(AgSettings *settings)
 {
-    settings->priv                  = ag_settings_get_instance_private(settings);
-    settings->priv->settings_window = g_settings_new(SETTINGS_SCHEMA_ID_WINDOW);
-    settings->priv->settings_chart  = g_settings_new(SETTINGS_SCHEMA_ID_CHART);
+    AgSettingsPrivate *priv = ag_settings_get_instance_private(settings);
+
+    priv->settings_window = g_settings_new(SETTINGS_SCHEMA_ID_WINDOW);
+    priv->settings_chart  = g_settings_new(SETTINGS_SCHEMA_ID_CHART);
 }
 
 static void
 ag_settings_dispose(GObject *object)
 {
-    AgSettings *settings = AG_SETTINGS(object);
+    AgSettingsPrivate *priv = ag_settings_get_instance_private(AG_SETTINGS(object));
 
-    g_clear_object(&settings->priv->settings_window);
-    g_clear_object(&settings->priv->settings_chart);
+    g_clear_object(&priv->settings_window);
+    g_clear_object(&priv->settings_chart);
 
     G_OBJECT_CLASS(ag_settings_parent_class)->dispose(object);
 }
@@ -35,6 +36,7 @@ static void
 ag_settings_finalize(GObject *object)
 {
     singleton = NULL;
+
     G_OBJECT_CLASS(ag_settings_parent_class)->finalize(object);
 }
 
@@ -64,12 +66,15 @@ ag_settings_get(void)
 GSettings *
 ag_settings_peek_window_settings(AgSettings *settings)
 {
-    return settings->priv->settings_window;
+    AgSettingsPrivate *priv = ag_settings_get_instance_private(settings);
+
+    return priv->settings_window;
 }
 
 GSettings *
 ag_settings_peek_chart_settings(AgSettings *settings)
 {
-    return settings->priv->settings_chart;
-}
+    AgSettingsPrivate *priv = ag_settings_get_instance_private(settings);
 
+    return priv->settings_chart;
+}
diff --git a/src/ag-settings.h b/src/ag-settings.h
index 032f3ed..ac15863 100644
--- a/src/ag-settings.h
+++ b/src/ag-settings.h
@@ -19,9 +19,6 @@ typedef struct _AgSettingsPrivate AgSettingsPrivate;
 
 struct _AgSettings {
     GObject parent_instance;
-
-    /*< private >*/
-    AgSettingsPrivate *priv;
 };
 
 struct _AgSettingsClass {