diff --git a/briar-gtk/briar_gtk/actions/window.py b/briar-gtk/briar_gtk/actions/window.py
index d2beb9b5f49b6cb8df496a0609ad6559de027ce1..71f01f2010e021638dbc40d6a189d573ccda6243 100644
--- a/briar-gtk/briar_gtk/actions/window.py
+++ b/briar-gtk/briar_gtk/actions/window.py
@@ -65,13 +65,14 @@ class WindowActions(Actions):
     # pylint: disable=unused-argument
     def _back_to_sidebar(self, action, parameter):
         if not isinstance(self.widget.current_view, MainWindowView):
-            return  # No Exception thrown because shortcut may come from other view
+            return  # No Exception because shortcut can come from other view
         self.widget.current_view.presenter.close_private_chat()
 
     # pylint: disable=unused-argument
     def _delete_all_messages_dialog(self, action, parameter):
         if not isinstance(self.widget.current_view, MainWindowView):
-            raise Exception("Should delete all messages only from MainWindowView")
+            raise Exception(
+                "Should delete all messages only from MainWindowView")
         self.widget.current_view.presenter.open_delete_all_messages_dialog()
 
     # pylint: disable=unused-argument
@@ -103,5 +104,7 @@ class WindowActions(Actions):
     # pylint: disable=unused-argument
     def _open_private_chat(self, action, contact_id):
         if not isinstance(self.widget.current_view, MainWindowView):
-            raise Exception("Should open private chat only from MainWindowView")
-        self.widget.current_view.presenter.open_private_chat(contact_id.get_int32())
+            raise Exception(
+                "Should open private chat only from MainWindowView")
+        self.widget.current_view.presenter.open_private_chat(
+            contact_id.get_int32())
diff --git a/briar-gtk/briar_gtk/presenters/__init__.py b/briar-gtk/briar_gtk/presenters/__init__.py
index d793e06631ea0761d822b96628d96b1edfd6f6a9..5ad73fc0e34f26d139aa27a789b5780cfe052b6e 100644
--- a/briar-gtk/briar_gtk/presenters/__init__.py
+++ b/briar-gtk/briar_gtk/presenters/__init__.py
@@ -2,5 +2,6 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 # License-Filename: LICENSE.md
 """
-Presenters (of MVP pattern) reacting to user input and model/data updates in Briar GTK
+Presenters (of MVP pattern) reacting to user input and model/data updates
+in Briar GTK
 """
diff --git a/briar-gtk/briar_gtk/widgets/edit_dialog.py b/briar-gtk/briar_gtk/widgets/edit_dialog.py
index f70a293271fabb20b544647912fdb4fbfd9fe548..622c2739577d3dd3be3c39e0db1eaf1a6eb029e6 100644
--- a/briar-gtk/briar_gtk/widgets/edit_dialog.py
+++ b/briar-gtk/briar_gtk/widgets/edit_dialog.py
@@ -7,6 +7,7 @@ from gi.repository import Gtk
 
 
 class EditDialog(Gtk.Dialog):
+
     def __init__(self, parent: "Gtk.Window", flags: "Gtk.DialogFlags",
                  placeholder: str, text: str = ""):
         Gtk.Dialog.__init__(
@@ -22,17 +23,17 @@ class EditDialog(Gtk.Dialog):
         )
         self.set_default_size(150, 100)
 
-        self.__alias_entry = Gtk.Entry()
-        self.__alias_entry.set_text(placeholder)
-        self.__alias_entry.set_size_request(250, 0)
+        self._alias_entry = Gtk.Entry()
+        self._alias_entry.set_text(placeholder)
+        self._alias_entry.set_size_request(250, 0)
 
         dialog_box = self.get_content_area()
 
         dialog_text = Gtk.Label(label=text)
         dialog_box.add(dialog_text)
 
-        dialog_box.add(self.__alias_entry)
+        dialog_box.add(self._alias_entry)
         self.show_all()
 
     def get_entry(self) -> "Gtk.Entry":
-        return self.__alias_entry
+        return self._alias_entry
diff --git a/briar-gtk/briar_gtk/window.py b/briar-gtk/briar_gtk/window.py
index 6401f152c7dd3f133d59cb7aacac1363f5ed4afa..f72ba0988df410ebe27360d28edcf2d1a386ca87 100644
--- a/briar-gtk/briar_gtk/window.py
+++ b/briar-gtk/briar_gtk/window.py
@@ -2,8 +2,6 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 # License-Filename: LICENSE.md
 
-import os
-
 from gettext import gettext as _
 from gi.repository import Gio, Gtk