diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp
index 392a198d7..0096aa55c 100644
--- a/src/swiftdata/swiftdata.cpp
+++ b/src/swiftdata/swiftdata.cpp
@@ -76,7 +76,7 @@ void CSwiftData::closeEvent(QCloseEvent *event)
     this->performGracefulShutdown();
 }
 
-void CSwiftData::ps_appendLogMessage(const CStatusMessage &message)
+void CSwiftData::appendLogMessage(const CStatusMessage &message)
 {
     if (!ui->comp_MainInfoArea) { return; } // not initialized yet
     CLogComponent *logComponent = ui->comp_MainInfoArea->getLogComponent();
@@ -87,7 +87,7 @@ void CSwiftData::ps_appendLogMessage(const CStatusMessage &message)
     m_statusBar.displayStatusMessage(message);
 }
 
-void CSwiftData::ps_onStyleSheetsChanged()
+void CSwiftData::onStyleSheetsChanged()
 {
     this->initStyleSheet();
 }
@@ -102,7 +102,7 @@ void CSwiftData::init()
     this->m_mwaOverlayFrame = ui->comp_MainInfoArea->getMappingComponent();
 
     this->initStyleSheet();
-    connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CSwiftData::ps_onStyleSheetsChanged);
+    connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CSwiftData::onStyleSheetsChanged);
     this->initMenu();
 
     // update title
@@ -125,7 +125,7 @@ void CSwiftData::initLogDisplay()
     auto logHandler = CLogHandler::instance()->handlerForPattern(
                           CLogPattern().withSeverityAtOrAbove(CStatusMessage::SeverityInfo)
                       );
-    logHandler->subscribe(this, &CSwiftData::ps_appendLogMessage);
+    logHandler->subscribe(this, &CSwiftData::appendLogMessage);
 }
 
 void CSwiftData::initMenu()
@@ -135,9 +135,9 @@ void CSwiftData::initMenu()
     this->initDynamicMenus();
     ui->menu_WindowMinimize->setIcon(this->style()->standardIcon(QStyle::SP_TitleBarMinButton));
 
-    connect(ui->menu_WindowFont, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked);
-    connect(ui->menu_MappingMaxData, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked);
-    connect(ui->menu_MappingMaxMapping, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked);
+    connect(ui->menu_WindowFont, &QAction::triggered, this, &CSwiftData::onMenuClicked);
+    connect(ui->menu_MappingMaxData, &QAction::triggered, this, &CSwiftData::onMenuClicked);
+    connect(ui->menu_MappingMaxMapping, &QAction::triggered, this, &CSwiftData::onMenuClicked);
 
     sGui->addMenuFile(*ui->menu_File);
     sGui->addMenuInternals(*ui->menu_Internals);
diff --git a/src/swiftdata/swiftdata.h b/src/swiftdata/swiftdata.h
index 3f149eed0..d548ef627 100644
--- a/src/swiftdata/swiftdata.h
+++ b/src/swiftdata/swiftdata.h
@@ -26,10 +26,7 @@
 class QWidget;
 
 namespace Ui { class CSwiftData; }
-namespace BlackCore
-{
-    class CWebDataServices;
-}
+namespace BlackCore { class CWebDataServices; }
 
 /*!
  * swift data entry control (aka mapping tool)
@@ -55,17 +52,16 @@ protected:
     virtual void closeEvent(QCloseEvent *event) override;
     //! @}
 
-private slots:
+private:
     //! Append log message
-    void ps_appendLogMessage(const BlackMisc::CStatusMessage &message);
+    void appendLogMessage(const BlackMisc::CStatusMessage &message);
 
     //! Style sheet has changed
-    void ps_onStyleSheetsChanged();
+    void onStyleSheetsChanged();
 
     //! Menu clicked
-    void ps_onMenuClicked();
+    void onMenuClicked();
 
-private:
     void init();
     void initLogDisplay();
     void initStyleSheet();
@@ -78,7 +74,7 @@ private:
     void displayConsole();
     void displayLog();
 
-    BlackGui::CManagedStatusBar    m_statusBar;
+    BlackGui::CManagedStatusBar m_statusBar;
     QScopedPointer<Ui::CSwiftData> ui;
     BlackMisc::CWorkerPointer<BlackCore::Db::CBackgroundDataUpdater> m_updater;
     BlackMisc::CSettingReadOnly<BlackGui::Settings::TBackgroundConsolidation> m_consolidationSettings { this, &CSwiftData::consolidationSettingChanged }; //!< consolidation time
diff --git a/src/swiftdata/swiftdatamenus.cpp b/src/swiftdata/swiftdatamenus.cpp
index 0df29c3f1..f5472d9ea 100644
--- a/src/swiftdata/swiftdatamenus.cpp
+++ b/src/swiftdata/swiftdatamenus.cpp
@@ -29,7 +29,7 @@ using namespace BlackCore;
 using namespace BlackGui::Components;
 using namespace BlackMisc;
 
-void CSwiftData::ps_onMenuClicked()
+void CSwiftData::onMenuClicked()
 {
     QObject *sender = QObject::sender();
     if (sender == ui->menu_WindowFont)