diff --git a/src/blackgui/components/dbliverycolorsearchdialog.cpp b/src/blackgui/components/dbliverycolorsearchdialog.cpp
index c1d488c5f..d00322fe4 100644
--- a/src/blackgui/components/dbliverycolorsearchdialog.cpp
+++ b/src/blackgui/components/dbliverycolorsearchdialog.cpp
@@ -25,7 +25,7 @@ namespace BlackGui
             ui(new Ui::CDbLiveryColorSearchDialog)
         {
             ui->setupUi(this);
-            connect(this, &CDbLiveryColorSearchDialog::accepted, this, &CDbLiveryColorSearchDialog::ps_onAccepted);
+            connect(this, &CDbLiveryColorSearchDialog::accepted, this, &CDbLiveryColorSearchDialog::onAccepted);
         }
 
         CDbLiveryColorSearchDialog::~CDbLiveryColorSearchDialog()
@@ -33,12 +33,12 @@ namespace BlackGui
 
         const CLivery &CDbLiveryColorSearchDialog::getLivery() const
         {
-            return this->m_foundLivery;
+            return m_foundLivery;
         }
 
-        void CDbLiveryColorSearchDialog::ps_onAccepted()
+        void CDbLiveryColorSearchDialog::onAccepted()
         {
-            this->m_foundLivery = ui->comp_LiverySearch->getLivery();
+            m_foundLivery = ui->comp_LiverySearch->getLivery();
         }
     } // ns
 } // ns
diff --git a/src/blackgui/components/dbliverycolorsearchdialog.h b/src/blackgui/components/dbliverycolorsearchdialog.h
index 1f3792659..4cbea36d3 100644
--- a/src/blackgui/components/dbliverycolorsearchdialog.h
+++ b/src/blackgui/components/dbliverycolorsearchdialog.h
@@ -33,14 +33,14 @@ namespace BlackGui
             explicit CDbLiveryColorSearchDialog(QWidget *parent = nullptr);
 
             //! Destructor
-            ~CDbLiveryColorSearchDialog();
+            virtual ~CDbLiveryColorSearchDialog();
 
             //! Found livery if any, otherwise default
             const BlackMisc::Aviation::CLivery &getLivery() const;
 
         private:
             //! Dialog has been accepted
-            void ps_onAccepted();
+            void onAccepted();
 
             BlackMisc::Aviation::CLivery m_foundLivery; //!< last livery found
 
diff --git a/src/blackgui/editors/liveryform.cpp b/src/blackgui/editors/liveryform.cpp
index b4cfeb9ab..5feff4081 100644
--- a/src/blackgui/editors/liveryform.cpp
+++ b/src/blackgui/editors/liveryform.cpp
@@ -91,9 +91,9 @@ namespace BlackGui
 
         bool CLiveryForm::setValue(const CLivery &livery)
         {
-            if (this->m_originalLivery == livery) { return false; }
+            if (m_originalLivery == livery) { return false; }
 
-            this->m_originalLivery = livery;
+            m_originalLivery = livery;
             ui->comp_LiverySelector->setLivery(livery);
             ui->le_Id->setText(livery.getDbKeyAsString());
             ui->le_Description->setText(livery.getDescription());
@@ -172,7 +172,7 @@ namespace BlackGui
 
         void CLiveryForm::setReadOnly(bool readOnly)
         {
-            this->m_readOnly = readOnly;
+            m_readOnly = readOnly;
             ui->le_Id->setReadOnly(readOnly);
             ui->comp_LiverySelector->setReadOnly(readOnly);
             ui->le_Description->setReadOnly(readOnly);
@@ -249,14 +249,14 @@ namespace BlackGui
 
         void CLiveryForm::ps_searchForColor()
         {
-            if (!this->m_colorSearch)
+            if (!m_colorSearch)
             {
-                this->m_colorSearch = new CDbLiveryColorSearchDialog(this);
-                this->m_colorSearch->setModal(true);
+                m_colorSearch = new CDbLiveryColorSearchDialog(this);
+                m_colorSearch->setModal(true);
             }
-            const QDialog::DialogCode c = static_cast<QDialog::DialogCode>(this->m_colorSearch->exec());
+            const QDialog::DialogCode c = static_cast<QDialog::DialogCode>(m_colorSearch->exec());
             if (c == QDialog::Rejected) { return; }
-            const CLivery found = this->m_colorSearch->getLivery();
+            const CLivery found = m_colorSearch->getLivery();
             if (found.isLoadedFromDb())
             {
                 this->setValue(found);
diff --git a/src/blackmisc/aviation/liverylist.h b/src/blackmisc/aviation/liverylist.h
index 3a6dffda1..7efea3082 100644
--- a/src/blackmisc/aviation/liverylist.h
+++ b/src/blackmisc/aviation/liverylist.h
@@ -53,10 +53,10 @@ namespace BlackMisc
             CLivery findStdLiveryByAirlineIcaoVDesignator(const CAirlineIcaoCode &icao) const;
 
             //! Search for colors
-            CLivery findColorLiveryOrDefault(const BlackMisc::CRgbColor &fuselage, const CRgbColor &tail) const;
+            CLivery findColorLiveryOrDefault(const CRgbColor &fuselage, const CRgbColor &tail) const;
 
             //! Search for colors
-            CLivery findClosestColorLiveryOrDefault(const BlackMisc::CRgbColor &fuselage, const CRgbColor &tail) const;
+            CLivery findClosestColorLiveryOrDefault(const CRgbColor &fuselage, const CRgbColor &tail) const;
 
             //! By simplified name
             CLiveryList findStdLiveriesBySimplifiedAirlineName(const QString &containedString) const;