diff --git a/src/app/browser.hpp b/src/app/browser.hpp
index a4f77be4..5c0b9122 100644
--- a/src/app/browser.hpp
+++ b/src/app/browser.hpp
@@ -19,10 +19,8 @@ namespace app
 
     class Browser : public Gtk::ApplicationWindow
     {
-        private:
-
-            app::browser::Header * header;
-            app::browser::Main * main;
+        app::browser::Header * header;
+        app::browser::Main * main;
 
         public:
 
diff --git a/src/app/browser/header.hpp b/src/app/browser/header.hpp
index af8621a5..04296f01 100644
--- a/src/app/browser/header.hpp
+++ b/src/app/browser/header.hpp
@@ -13,10 +13,8 @@ namespace app::browser
 
     class Header : public Gtk::HeaderBar
     {
-        private:
-
-            app::browser::header::Menu * menu;
-            app::browser::header::Tab * tab;
+        app::browser::header::Menu * menu;
+        app::browser::header::Tab * tab;
 
         public:
 
diff --git a/src/app/browser/header/menu.hpp b/src/app/browser/header/menu.hpp
index d967bb0a..5d984bd2 100644
--- a/src/app/browser/header/menu.hpp
+++ b/src/app/browser/header/menu.hpp
@@ -9,12 +9,10 @@ namespace app::browser::header
 {
     class Menu : public Gtk::MenuButton
     {
-        private:
-
-            Glib::RefPtr<Gio::Menu> tab,
-                                    tab_close,
-                                    tool,
-                                    main;
+        Glib::RefPtr<Gio::Menu> tab,
+                                tab_close,
+                                tool,
+                                main;
 
         public:
 
diff --git a/src/app/browser/main.hpp b/src/app/browser/main.hpp
index d4d4e0bf..10a3a77a 100644
--- a/src/app/browser/main.hpp
+++ b/src/app/browser/main.hpp
@@ -12,9 +12,7 @@ namespace app::browser
 
     class Main : public Gtk::Box
     {
-        private:
-
-            app::browser::main::Tab * tab;
+        app::browser::main::Tab * tab;
 
         public:
 
diff --git a/src/app/browser/main/tab.hpp b/src/app/browser/main/tab.hpp
index 2afb22f7..a05aa9fb 100644
--- a/src/app/browser/main/tab.hpp
+++ b/src/app/browser/main/tab.hpp
@@ -9,12 +9,10 @@ namespace app::browser::main
 {
     class Tab : public Gtk::Notebook
     {
-        private:
-
-            void on_switch(
-                Gtk::Widget * page,
-                guint page_num
-            );
+        void on_switch(
+            Gtk::Widget * page,
+            guint page_num
+        );
 
         public:
 
diff --git a/src/app/browser/main/tab/label.hpp b/src/app/browser/main/tab/label.hpp
index e2865495..d17c3d5f 100644
--- a/src/app/browser/main/tab/label.hpp
+++ b/src/app/browser/main/tab/label.hpp
@@ -10,15 +10,13 @@ namespace app::browser::main::tab
 {
     class Label : public Gtk::Label
     {
-        private:
+        Glib::RefPtr<Gtk::GestureClick> controller;
 
-            Glib::RefPtr<Gtk::GestureClick> controller;
-
-            void on_click(
-                int n,
-                double x,
-                double y
-            );
+        void on_click(
+            int n,
+            double x,
+            double y
+        );
 
         public:
 
diff --git a/src/app/browser/main/tab/page.hpp b/src/app/browser/main/tab/page.hpp
index a71b59eb..538f2c20 100644
--- a/src/app/browser/main/tab/page.hpp
+++ b/src/app/browser/main/tab/page.hpp
@@ -22,16 +22,14 @@ namespace app::browser::main::tab
 
     class Page : public Gtk::Box
     {
-        private:
+        char buffer[0xfffff];
 
-            char buffer[0xfffff];
+        Glib::RefPtr<Gio::SimpleActionGroup> action_group;
+        Glib::RefPtr<Gio::SocketClient> socket_client;
+        Glib::RefPtr<Gio::SocketConnection> socket_connection;
 
-            Glib::RefPtr<Gio::SimpleActionGroup> action_group;
-            Glib::RefPtr<Gio::SocketClient> socket_client;
-            Glib::RefPtr<Gio::SocketConnection> socket_connection;
-
-            page::Navbar * navbar;
-            page::Content * content;
+        page::Navbar * navbar;
+        page::Content * content;
 
         public:
 
diff --git a/src/app/browser/main/tab/page/navbar.hpp b/src/app/browser/main/tab/page/navbar.hpp
index 249f847d..f17b750d 100644
--- a/src/app/browser/main/tab/page/navbar.hpp
+++ b/src/app/browser/main/tab/page/navbar.hpp
@@ -20,21 +20,19 @@ namespace app::browser::main::tab::page
 
     class Navbar : public Gtk::Box
     {
-        private:
-
-            // Actions
-            Glib::RefPtr<Gio::SimpleActionGroup> action_group;
-
-            // Components
-            navbar::Base * base;
-            navbar::Bookmark * bookmark;
-            navbar::History * history;
-            navbar::Request * request;
-            navbar::Update * update;
-
-            // Defaults
-            const int SPACING = 8;
-            const int MARGIN = 8;
+        // Actions
+        Glib::RefPtr<Gio::SimpleActionGroup> action_group;
+
+        // Components
+        navbar::Base * base;
+        navbar::Bookmark * bookmark;
+        navbar::History * history;
+        navbar::Request * request;
+        navbar::Update * update;
+
+        // Defaults
+        const int SPACING = 8;
+        const int MARGIN = 8;
 
         public:
 
diff --git a/src/app/browser/main/tab/page/navbar/history.hpp b/src/app/browser/main/tab/page/navbar/history.hpp
index d4e3f59b..7142aabf 100644
--- a/src/app/browser/main/tab/page/navbar/history.hpp
+++ b/src/app/browser/main/tab/page/navbar/history.hpp
@@ -14,10 +14,8 @@ namespace app::browser::main::tab::page::navbar
 
     class History : public Gtk::Box
     {
-        private:
-
-            history::Back * back;
-            history::Forward * forward;
+        history::Back * back;
+        history::Forward * forward;
 
         public:
 
diff --git a/src/app/browser/main/tab/page/navbar/request.hpp b/src/app/browser/main/tab/page/navbar/request.hpp
index afa8ec0e..43e34af0 100644
--- a/src/app/browser/main/tab/page/navbar/request.hpp
+++ b/src/app/browser/main/tab/page/navbar/request.hpp
@@ -11,15 +11,13 @@ namespace app::browser::main::tab::page::navbar
 {
     class Request : public Gtk::Entry
     {
-        private:
+        std::string scheme,
+                    host,
+                    port,
+                    path,
+                    query;
 
-            std::string scheme,
-                        host,
-                        port,
-                        path,
-                        query;
-
-            void parse();
+        void parse();
 
         public:
 
diff --git a/src/lib/database.hpp b/src/lib/database.hpp
index 9957249e..a379605b 100644
--- a/src/lib/database.hpp
+++ b/src/lib/database.hpp
@@ -12,13 +12,11 @@ namespace lib
 
     class Database
     {
-        private:
+        int status;
 
-            int status;
+        char * error;
 
-            char * error;
-
-            sqlite3 * connection;
+        sqlite3 * connection;
 
         public:
 
diff --git a/src/lib/database/session.hpp b/src/lib/database/session.hpp
index f3ed3cf6..1f61413b 100644
--- a/src/lib/database/session.hpp
+++ b/src/lib/database/session.hpp
@@ -7,13 +7,11 @@ namespace lib::database
 {
     class Session
     {
-        private:
+        int status;
 
-            int status;
+        char * error;
 
-            char * error;
-
-            sqlite3 * connection;
+        sqlite3 * connection;
 
         public: