diff --git a/src/View/HydraulicStructures/BasicHydraulicStructures/Table.py b/src/View/HydraulicStructures/BasicHydraulicStructures/Table.py
index 2bea72d250aa37ea04aadfb731c878081e59b7d3..18d7b8540f3c2baeb9bb151cb46aa69274ebc110 100644
--- a/src/View/HydraulicStructures/BasicHydraulicStructures/Table.py
+++ b/src/View/HydraulicStructures/BasicHydraulicStructures/Table.py
@@ -61,15 +61,13 @@ class ComboBoxDelegate(QItemDelegate):
     def createEditor(self, parent, option, index):
         self.editor = QComboBox(parent)
 
-
         lst = list(
             map(
-                lambda k: self._long_types[k], BHS_types.keys()
+                lambda k: self._long_types[k],
+                BHS_types.keys()
             )
         )
-        self.editor.addItems(
-            lst
-        )
+        self.editor.addItems(lst)
 
         self.editor.setCurrentText(index.data(Qt.DisplayRole))
         return self.editor
@@ -159,8 +157,8 @@ class TableModel(PamhyrTableModel):
         question = QMessageBox(self._parent)
 
         question.setWindowTitle(self._trad['msg_type_change_title'])
-        question.setText(self._trad['msg_type_change_msg'])
-        question.setStandardButtons(QMessageBox.Cancel | QMessageBox.Ok )
+        question.setText(self._trad['msg_type_change_text'])
+        question.setStandardButtons(QMessageBox.Cancel | QMessageBox.Ok)
         question.setIcon(QMessageBox.Question)
 
         res = question.exec()
diff --git a/src/View/HydraulicStructures/BasicHydraulicStructures/Translate.py b/src/View/HydraulicStructures/BasicHydraulicStructures/Translate.py
index 787d4cdb3165e27eccc92f27838a8d2ab63463f2..42757cb6efbbb5e7f3035383f367c65d84c0c7a8 100644
--- a/src/View/HydraulicStructures/BasicHydraulicStructures/Translate.py
+++ b/src/View/HydraulicStructures/BasicHydraulicStructures/Translate.py
@@ -32,7 +32,7 @@ class BasicHydraulicStructuresTranslate(PamhyrTranslate):
             "Change hydraulic structure type"
         )
 
-        self._dict['msg_type_change_msg'] = _translate(
+        self._dict['msg_type_change_text'] = _translate(
             "BasicHydraulicStructures",
             "Do you want to change the hydraulic structure type and reset \
 hydraulic structure values?"
diff --git a/src/View/HydraulicStructures/BasicHydraulicStructures/UndoCommand.py b/src/View/HydraulicStructures/BasicHydraulicStructures/UndoCommand.py
index 5448d530ec031c2b9fa7fb05bec0e6b4ad435ff8..97dc7bf8d771b2bf5a8c7da8c95381c2cf813bc0 100644
--- a/src/View/HydraulicStructures/BasicHydraulicStructures/UndoCommand.py
+++ b/src/View/HydraulicStructures/BasicHydraulicStructures/UndoCommand.py
@@ -126,8 +126,7 @@ class PasteCommand(QUndoCommand):
         self._bhs.reverse()
 
     def undo(self):
-        self._hs.delete_i(range(self._row, self._row + len(self._bhs))
-        )
+        self._hs.delete_i(range(self._row, self._row + len(self._bhs)))
 
     def redo(self):
         for r in self._bhs:
diff --git a/src/View/HydraulicStructures/BasicHydraulicStructures/Window.py b/src/View/HydraulicStructures/BasicHydraulicStructures/Window.py
index e31a1c91e7b6e05bc3b1c3fe5f748434d877e38c..b13d7218ef421ae1d7290191da659a98366329d2 100644
--- a/src/View/HydraulicStructures/BasicHydraulicStructures/Window.py
+++ b/src/View/HydraulicStructures/BasicHydraulicStructures/Window.py
@@ -45,7 +45,9 @@ from View.HydraulicStructures.BasicHydraulicStructures.Table import (
 )
 
 from View.Network.GraphWidget import GraphWidget
-from View.HydraulicStructures.BasicHydraulicStructures.Translate import BasicHydraulicStructuresTranslate
+from View.HydraulicStructures.BasicHydraulicStructures.Translate import (
+    BasicHydraulicStructuresTranslate
+)
 
 _translate = QCoreApplication.translate
 
@@ -150,25 +152,25 @@ class BasicHydraulicStructuresWindow(PamhyrWindow):
 
         table = self.find(QTableView, "tableView")
         table.selectionModel()\
-                 .selectionChanged\
-                 .connect(self.update)
+             .selectionChanged\
+             .connect(self.update)
 
         self._table.layoutChanged.connect(self.update)
 
     def index_selected(self):
         table = self.find(QTableView, "tableView")
-        r = table.selectionModel()\
-                    .selectedRows()
-        if len(r)>0:
+        r = table.selectionModel().selectedRows()
+
+        if len(r) > 0:
             return r[0]
         else:
             return None
 
     def index_selected_row(self):
         table = self.find(QTableView, "tableView")
-        r = table.selectionModel()\
-                    .selectedRows()
-        if len(r)>0:
+        r = table.selectionModel().selectedRows()
+
+        if len(r) > 0:
             return r[0].row()
         else:
             return None
@@ -187,6 +189,7 @@ class BasicHydraulicStructuresWindow(PamhyrWindow):
 
     def add(self):
         rows = self.index_selected_rows()
+
         if len(self._hs) == 0 or len(rows) == 0:
             self._table.add(0)
         else:
@@ -194,6 +197,7 @@ class BasicHydraulicStructuresWindow(PamhyrWindow):
 
     def delete(self):
         rows = self.index_selected_rows()
+
         if len(rows) == 0:
             return
 
@@ -213,6 +217,7 @@ class BasicHydraulicStructuresWindow(PamhyrWindow):
 
     def _set_checkbox_state(self):
         row = self.index_selected_row()
+
         if row is None:
             self._checkbox.setEnabled(False)
             self._checkbox.setChecked(True)
@@ -222,6 +227,7 @@ class BasicHydraulicStructuresWindow(PamhyrWindow):
 
     def _set_basic_structure_state(self):
         row = self.index_selected_row()
+
         if row is not None:
             self._table.enabled(
                 row,
@@ -230,7 +236,3 @@ class BasicHydraulicStructuresWindow(PamhyrWindow):
 
     def update(self):
         self._set_checkbox_state()
-        self._update_clear_plot()
-
-    def _update_clear_plot(self):
-        rows = self.index_selected_rows()
diff --git a/src/View/HydraulicStructures/Window.py b/src/View/HydraulicStructures/Window.py
index 7c139dd3906f016ab859a6a8852b4e65cb39b63b..2a0719067d513f58eb419bfa172ebc6842a8973e 100644
--- a/src/View/HydraulicStructures/Window.py
+++ b/src/View/HydraulicStructures/Window.py
@@ -48,7 +48,9 @@ from View.HydraulicStructures.Table import (
 from View.Network.GraphWidget import GraphWidget
 from View.HydraulicStructures.Translate import HydraulicStructuresTranslate
 
-from View.HydraulicStructures.BasicHydraulicStructures.Window import BasicHydraulicStructuresWindow
+from View.HydraulicStructures.BasicHydraulicStructures.Window import (
+    BasicHydraulicStructuresWindow
+)
 
 _translate = QCoreApplication.translate