diff --git a/src/modules/tracking/Config.cpp b/src/modules/tracking/Config.cpp
index 30c6c30d1..723465862 100644
--- a/src/modules/tracking/Config.cpp
+++ b/src/modules/tracking/Config.cpp
@@ -47,7 +47,7 @@ TrackingStyleConfig::TrackingStyleConfig( QObject* parent )
 {
 }
 
-TrackingStyleConfig::~TrackingStyleConfig() { }
+TrackingStyleConfig::~TrackingStyleConfig() {}
 
 void
 TrackingStyleConfig::setTracking( bool enabled )
@@ -179,20 +179,20 @@ Config::Config( QObject* parent )
 static void
 enableLevelsBelow( Config* config, TrackingType level )
 {
-    switch( level )
+    switch ( level )
     {
-        case TrackingType::UserTracking:
-            config->userTracking()->setTracking( TrackingStyleConfig::TrackingState::EnabledByUser );
-            FALLTHRU;
-        case TrackingType::MachineTracking:
-            config->machineTracking()->setTracking( TrackingStyleConfig::TrackingState::EnabledByUser );
-            FALLTHRU;
-        case TrackingType::InstallTracking:
-            config->installTracking()->setTracking( TrackingStyleConfig::TrackingState::EnabledByUser );
-            break;
-        case TrackingType::NoTracking:
-            config->noTracking( true );
-            break;
+    case TrackingType::UserTracking:
+        config->userTracking()->setTracking( TrackingStyleConfig::TrackingState::EnabledByUser );
+        FALLTHRU;
+    case TrackingType::MachineTracking:
+        config->machineTracking()->setTracking( TrackingStyleConfig::TrackingState::EnabledByUser );
+        FALLTHRU;
+    case TrackingType::InstallTracking:
+        config->installTracking()->setTracking( TrackingStyleConfig::TrackingState::EnabledByUser );
+        break;
+    case TrackingType::NoTracking:
+        config->noTracking( true );
+        break;
     }
 }
 
diff --git a/src/modules/tracking/TrackingJobs.cpp b/src/modules/tracking/TrackingJobs.cpp
index 3d8ea27f1..cd885194c 100644
--- a/src/modules/tracking/TrackingJobs.cpp
+++ b/src/modules/tracking/TrackingJobs.cpp
@@ -36,7 +36,7 @@ TrackingInstallJob::TrackingInstallJob( const QString& url )
 {
 }
 
-TrackingInstallJob::~TrackingInstallJob() { }
+TrackingInstallJob::~TrackingInstallJob() {}
 
 QString
 TrackingInstallJob::prettyName() const
@@ -82,11 +82,10 @@ TrackingInstallJob::addJob( Calamares::JobList& list, InstallTrackingConfig* con
     if ( config->isEnabled() )
     {
         const auto* s = CalamaresUtils::System::instance();
-        QHash<QString, QString> map { std::initializer_list< std::pair< QString, QString > > {
-            { QStringLiteral("CPU"), s->getCpuDescription() },
-            { QStringLiteral("MEMORY"), QString::number( s->getTotalMemoryB().first ) },
-            { QStringLiteral("DISK"), QString::number( s->getTotalDiskB() ) }
-        } };
+        QHash< QString, QString > map { std::initializer_list< std::pair< QString, QString > > {
+            { QStringLiteral( "CPU" ), s->getCpuDescription() },
+            { QStringLiteral( "MEMORY" ), QString::number( s->getTotalMemoryB().first ) },
+            { QStringLiteral( "DISK" ), QString::number( s->getTotalDiskB() ) } } };
         QString installUrl = KMacroExpander::expandMacros( config->installTrackingUrl(), map );
 
         cDebug() << Logger::SubEntry << "install-tracking URL" << installUrl;
@@ -134,14 +133,14 @@ TrackingMachineUpdateManagerJob::prettyStatusMessage() const
 Calamares::JobResult
 TrackingMachineUpdateManagerJob::exec()
 {
-    static const auto script = QStringLiteral( "sed -i '/^URI/s,${MACHINE_ID},'`cat /etc/machine-id`',' /etc/update-manager/meta-release || true" );
+    static const auto script = QStringLiteral(
+        "sed -i '/^URI/s,${MACHINE_ID},'`cat /etc/machine-id`',' /etc/update-manager/meta-release || true" );
 
-    auto res = CalamaresUtils::System::instance()->runCommand(
-        CalamaresUtils::System::RunLocation::RunInTarget,
-        QStringList { QStringLiteral( "/bin/sh" ) },
-        QString(),  // Working dir
-        script,  // standard input
-        std::chrono::seconds( 1 ) );
+    auto res = CalamaresUtils::System::instance()->runCommand( CalamaresUtils::System::RunLocation::RunInTarget,
+                                                               QStringList { QStringLiteral( "/bin/sh" ) },
+                                                               QString(),  // Working dir
+                                                               script,  // standard input
+                                                               std::chrono::seconds( 1 ) );
     int r = res.first;
 
     if ( r == 0 )
diff --git a/src/modules/tracking/TrackingPage.cpp b/src/modules/tracking/TrackingPage.cpp
index d206a20a3..c9234d01c 100644
--- a/src/modules/tracking/TrackingPage.cpp
+++ b/src/modules/tracking/TrackingPage.cpp
@@ -45,27 +45,33 @@ TrackingPage::TrackingPage( Config* config, QWidget* parent )
     // Each "panel" of configuration has the same kind of setup,
     // where the xButton and xCheckBox is connected to the xTracking
     // configuration object; that takes macro-trickery, unfortunately.
-#define trackingSetup(x) { \
-    connect( ui->x ## CheckBox, &QCheckBox::stateChanged, \
-        this, &TrackingPage::buttonChecked ); \
-    connect( ui->x ## CheckBox, &QCheckBox::stateChanged, \
-        config->x ## Tracking(), QOverload<bool>::of( &TrackingStyleConfig::setTracking ) ); \
-    connect( config->x ## Tracking(), &TrackingStyleConfig::trackingChanged, \
-        this, [ this, config ]() { this->trackerChanged( config->x ## Tracking(), this->ui->x ## Group, this->ui->x ## CheckBox);} ); \
-    connect( ui->x ## PolicyButton, &QAbstractButton::clicked, \
-        config, [ config ] { QString url( config->x ## Tracking()->policy() ); if ( !url.isEmpty() ) { QDesktopServices::openUrl( url ); } } );  \
-}
+#define trackingSetup( x ) \
+    { \
+        connect( ui->x##CheckBox, &QCheckBox::stateChanged, this, &TrackingPage::buttonChecked ); \
+        connect( ui->x##CheckBox, \
+                 &QCheckBox::stateChanged, \
+                 config->x##Tracking(), \
+                 QOverload< bool >::of( &TrackingStyleConfig::setTracking ) ); \
+        connect( config->x##Tracking(), &TrackingStyleConfig::trackingChanged, this, [this, config]() { \
+            this->trackerChanged( config->x##Tracking(), this->ui->x##Group, this->ui->x##CheckBox ); \
+        } ); \
+        connect( ui->x##PolicyButton, &QAbstractButton::clicked, config, [config] { \
+            QString url( config->x##Tracking()->policy() ); \
+            if ( !url.isEmpty() ) \
+            { \
+                QDesktopServices::openUrl( url ); \
+            } \
+        } ); \
+    }
 
-    trackingSetup( install )
-    trackingSetup( machine )
-    trackingSetup( user )
+    trackingSetup( install ) trackingSetup( machine ) trackingSetup( user )
 
 #undef trackingSetup
 
-    connect( config, &Config::generalPolicyChanged, [ this ]( const QString& url ) {
-        this->ui->generalPolicyLabel->setVisible( !url.isEmpty() );
-    } );
-    connect( ui->generalPolicyLabel, &QLabel::linkActivated, [ config ] {
+        connect( config, &Config::generalPolicyChanged, [this]( const QString& url ) {
+            this->ui->generalPolicyLabel->setVisible( !url.isEmpty() );
+        } );
+    connect( ui->generalPolicyLabel, &QLabel::linkActivated, [config] {
         QString url( config->generalPolicy() );
         if ( !url.isEmpty() )
         {
@@ -99,13 +105,15 @@ TrackingPage::retranslate()
             .arg( product ) );
 }
 
-bool TrackingPage::anyOtherChecked() const
+bool
+TrackingPage::anyOtherChecked() const
 {
-    return ui->installCheckBox->isChecked()  || ui->machineCheckBox->isChecked() || ui->userCheckBox->isChecked();
+    return ui->installCheckBox->isChecked() || ui->machineCheckBox->isChecked() || ui->userCheckBox->isChecked();
 }
 
 
-void TrackingPage::buttonNoneChecked(int state)
+void
+TrackingPage::buttonNoneChecked( int state )
 {
     if ( state )
     {
@@ -116,7 +124,8 @@ void TrackingPage::buttonNoneChecked(int state)
     }
 }
 
-void TrackingPage::buttonChecked(int state)
+void
+TrackingPage::buttonChecked( int state )
 {
     if ( state )
     {
@@ -133,7 +142,7 @@ void TrackingPage::buttonChecked(int state)
 }
 
 void
-TrackingPage::trackerChanged(TrackingStyleConfig* config, QWidget* panel, QCheckBox* check)
+TrackingPage::trackerChanged( TrackingStyleConfig* config, QWidget* panel, QCheckBox* check )
 {
     panel->setVisible( config->isConfigurable() );
     check->setChecked( config->isEnabled() );
diff --git a/src/modules/tracking/TrackingPage.h b/src/modules/tracking/TrackingPage.h
index 48599ead4..7df43b846 100644
--- a/src/modules/tracking/TrackingPage.h
+++ b/src/modules/tracking/TrackingPage.h
@@ -70,7 +70,7 @@ private:
      * hide the UI parts on the @p panel; otherwise show it
      * and set @p check state to whether the user has enabled it.
      */
-    void trackerChanged( TrackingStyleConfig* subconfig, QWidget* panel, QCheckBox* check);
+    void trackerChanged( TrackingStyleConfig* subconfig, QWidget* panel, QCheckBox* check );
 
     Ui::TrackingPage* ui;
 };
diff --git a/src/modules/tracking/TrackingViewStep.cpp b/src/modules/tracking/TrackingViewStep.cpp
index 125d17974..8a80b2b57 100644
--- a/src/modules/tracking/TrackingViewStep.cpp
+++ b/src/modules/tracking/TrackingViewStep.cpp
@@ -122,4 +122,3 @@ TrackingViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
     m_config->setConfigurationMap( configurationMap );
 }
-