diff --git a/src/modules/partition/Config.cpp b/src/modules/partition/Config.cpp
index 82c0ad846..508231a75 100644
--- a/src/modules/partition/Config.cpp
+++ b/src/modules/partition/Config.cpp
@@ -227,7 +227,8 @@ fillGSConfigurationEFI( Calamares::GlobalStorage* gs, const QVariantMap& configu
     QString firmwareType( PartUtils::isEfiSystem() ? QStringLiteral( "efi" ) : QStringLiteral( "bios" ) );
     gs->insert( "firmwareType", firmwareType );
 
-    gs->insert( "efiSystemPartition", CalamaresUtils::getString( configurationMap, "efiSystemPartition", QStringLiteral( "/boot/efi" ) ) );
+    gs->insert( "efiSystemPartition",
+                CalamaresUtils::getString( configurationMap, "efiSystemPartition", QStringLiteral( "/boot/efi" ) ) );
 
     // Read and parse key efiSystemPartitionSize
     if ( configurationMap.contains( "efiSystemPartitionSize" ) )
@@ -243,7 +244,7 @@ fillGSConfigurationEFI( Calamares::GlobalStorage* gs, const QVariantMap& configu
 }
 
 void
-Config::fillConfigurationFSTypes(const QVariantMap& configurationMap)
+Config::fillConfigurationFSTypes( const QVariantMap& configurationMap )
 {
     Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
 
@@ -256,15 +257,16 @@ Config::fillConfigurationFSTypes(const QVariantMap& configurationMap)
     if ( fsName.isEmpty() )
     {
         cWarning() << "Partition-module setting *defaultFileSystemType* is missing, will use ext4";
-        fsRealName = PartUtils::canonicalFilesystemName( QStringLiteral("ext4"), &fsType );
+        fsRealName = PartUtils::canonicalFilesystemName( QStringLiteral( "ext4" ), &fsType );
     }
     else
     {
         fsRealName = PartUtils::canonicalFilesystemName( fsName, &fsType );
         if ( fsType == FileSystem::Type::Unknown )
         {
-            cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << fsName << ") using ext4 instead";
-            fsRealName = PartUtils::canonicalFilesystemName( QStringLiteral("ext4"), &fsType );
+            cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << fsName
+                       << ") using ext4 instead";
+            fsRealName = PartUtils::canonicalFilesystemName( QStringLiteral( "ext4" ), &fsType );
         }
         else if ( fsRealName != fsName )
         {
@@ -326,7 +328,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
     m_requiredPartitionTableType = CalamaresUtils::getStringList( configurationMap, "requiredPartitionTableType" );
     gs->insert( "requiredPartitionTableType", m_requiredPartitionTableType );
 
-    fillGSConfigurationEFI(gs, configurationMap);
+    fillGSConfigurationEFI( gs, configurationMap );
     fillConfigurationFSTypes( configurationMap );
 }
 
diff --git a/src/modules/partition/Config.h b/src/modules/partition/Config.h
index 3365403fa..5f7e46821 100644
--- a/src/modules/partition/Config.h
+++ b/src/modules/partition/Config.h
@@ -27,7 +27,8 @@ class Config : public QObject
     Q_PROPERTY( SwapChoice swapChoice READ swapChoice WRITE setSwapChoice NOTIFY swapChoiceChanged )
 
     ///@brief Name of the FS that will be used when erasing type disk (e.g. "default filesystem")
-    Q_PROPERTY( QString eraseModeFilesystem READ eraseFsType WRITE setEraseFsTypeChoice NOTIFY eraseModeFilesystemChanged )
+    Q_PROPERTY(
+        QString eraseModeFilesystem READ eraseFsType WRITE setEraseFsTypeChoice NOTIFY eraseModeFilesystemChanged )
 
     Q_PROPERTY( bool allowManualPartitioning READ allowManualPartitioning CONSTANT FINAL )
 
@@ -134,7 +135,7 @@ public Q_SLOTS:
     void setInstallChoice( InstallChoice );
     void setSwapChoice( int );  ///< Translates a button ID or so to SwapChoice
     void setSwapChoice( SwapChoice );
-    void setEraseFsTypeChoice( const QString& filesystemName ); ///< See property eraseModeFilesystem
+    void setEraseFsTypeChoice( const QString& filesystemName );  ///< See property eraseModeFilesystem
 
 Q_SIGNALS:
     void installChoiceChanged( InstallChoice );
diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp
index 69ea4cb2e..a3d6e2db5 100644
--- a/src/modules/partition/PartitionViewStep.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -115,10 +115,11 @@ PartitionViewStep::prettyName() const
  * empty strings and duplicates. The list is in-order of how the
  * jobs will be run.
  */
-static QStringList jobDescriptions( const Calamares::JobList& jobs )
+static QStringList
+jobDescriptions( const Calamares::JobList& jobs )
 {
     QStringList jobsLines;
-    for( const Calamares::job_ptr& job : qAsConst( jobs ) )
+    for ( const Calamares::job_ptr& job : qAsConst( jobs ) )
     {
         if ( !job->prettyDescription().isEmpty() )
         {
@@ -132,7 +133,8 @@ static QStringList jobDescriptions( const Calamares::JobList& jobs )
  *
  * Returns a (branded) string describing what @p choice will do.
  */
-static QString modeDescription( Config::InstallChoice choice )
+static QString
+modeDescription( Config::InstallChoice choice )
 {
     const auto* branding = Calamares::Branding::instance();
     static const char context[] = "PartitionViewStep";
@@ -141,13 +143,15 @@ static QString modeDescription( Config::InstallChoice choice )
     {
     case Config::InstallChoice::Alongside:
         return QCoreApplication::translate( context, "Install %1 <strong>alongside</strong> another operating system." )
-                        .arg( branding->shortVersionedName() );
+            .arg( branding->shortVersionedName() );
         break;
     case Config::InstallChoice::Erase:
-        return QCoreApplication::translate( context, "<strong>Erase</strong> disk and install %1." ).arg( branding->shortVersionedName() );
+        return QCoreApplication::translate( context, "<strong>Erase</strong> disk and install %1." )
+            .arg( branding->shortVersionedName() );
         break;
     case Config::InstallChoice::Replace:
-        return QCoreApplication::translate( context, "<strong>Replace</strong> a partition with %1." ).arg( branding->shortVersionedName() );
+        return QCoreApplication::translate( context, "<strong>Replace</strong> a partition with %1." )
+            .arg( branding->shortVersionedName() );
         break;
     case Config::InstallChoice::NoChoice:
     case Config::InstallChoice::Manual:
@@ -163,7 +167,8 @@ static QString modeDescription( Config::InstallChoice choice )
  * is used to provide context; when more than one disk is in use, the description
  * works differently.
  */
-static QString diskDescription( int listLength, const PartitionCoreModule::SummaryInfo& info, Config::InstallChoice choice )
+static QString
+diskDescription( int listLength, const PartitionCoreModule::SummaryInfo& info, Config::InstallChoice choice )
 {
     const auto* branding = Calamares::Branding::instance();
     static const char context[] = "PartitionViewStep";
@@ -172,28 +177,33 @@ static QString diskDescription( int listLength, const PartitionCoreModule::Summa
     {
         switch ( choice )
         {
-            case Config::Alongside:
-                return QCoreApplication::translate( context, "Install %1 <strong>alongside</strong> another operating system on disk "
-                "<strong>%2</strong> (%3)." )
+        case Config::Alongside:
+            return QCoreApplication::translate(
+                       context,
+                       "Install %1 <strong>alongside</strong> another operating system on disk "
+                       "<strong>%2</strong> (%3)." )
                 .arg( branding->shortVersionedName() )
                 .arg( info.deviceNode )
                 .arg( info.deviceName );
-                break;
-            case Config::Erase:
-                return QCoreApplication::translate( context, "<strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1." )
+            break;
+        case Config::Erase:
+            return QCoreApplication::translate( context,
+                                                "<strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1." )
                 .arg( branding->shortVersionedName() )
                 .arg( info.deviceNode )
                 .arg( info.deviceName );
-                break;
-            case Config::Replace:
-                return QCoreApplication::translate( context, "<strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1." )
+            break;
+        case Config::Replace:
+            return QCoreApplication::translate(
+                       context, "<strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1." )
                 .arg( branding->shortVersionedName() )
                 .arg( info.deviceNode )
                 .arg( info.deviceName );
-                break;
-            case Config::NoChoice:
-            case Config::Manual:
-                return QCoreApplication::translate( context, "<strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2)." )
+            break;
+        case Config::NoChoice:
+        case Config::Manual:
+            return QCoreApplication::translate(
+                       context, "<strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2)." )
                 .arg( info.deviceNode )
                 .arg( info.deviceName );
         }
@@ -201,7 +211,9 @@ static QString diskDescription( int listLength, const PartitionCoreModule::Summa
     }
     else  // multiple disk previews!
     {
-        return QCoreApplication::translate( context, "Disk <strong>%1</strong> (%2)" ).arg( info.deviceNode ).arg( info.deviceName ) ;
+        return QCoreApplication::translate( context, "Disk <strong>%1</strong> (%2)" )
+            .arg( info.deviceNode )
+            .arg( info.deviceName );
     }
 }
 
@@ -216,7 +228,7 @@ PartitionViewStep::prettyStatus() const
     cDebug() << "Summary for Partition" << list.length() << choice;
     if ( list.length() > 1 )  // There are changes on more than one disk
     {
-        modeText = modeDescription(choice);
+        modeText = modeDescription( choice );
     }
 
     for ( const auto& info : list )
@@ -501,7 +513,7 @@ PartitionViewStep::onLeave()
 #else
                 PartitionTable::FlagEsp
 #endif
-                                                        );
+            );
             Partition* esp = m_core->findPartitionByMountPoint( espMountPoint );
 
             QString message;
@@ -644,8 +656,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
     QFuture< void > future = QtConcurrent::run( this, &PartitionViewStep::initPartitionCoreModule );
     m_future->setFuture( future );
 
-    m_core->initLayout( m_config->defaultFsType(),
-                        configurationMap.value( "partitionLayout" ).toList() );
+    m_core->initLayout( m_config->defaultFsType(), configurationMap.value( "partitionLayout" ).toList() );
 }
 
 
diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 4beac0db8..8792cb787 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -447,31 +447,31 @@ isEfiSystem()
 }
 
 bool
-isEfiFilesystemSuitable(const Partition* candidate)
+isEfiFilesystemSuitable( const Partition* candidate )
 {
     auto type = candidate->fileSystem().type();
     auto size = candidate->capacity();  // bytes
 
     using CalamaresUtils::Units::operator""_MiB;
 
-    switch( type )
+    switch ( type )
     {
-        case FileSystem::Type::Fat32:
-            if ( size >= 300_MiB )
-            {
-                return true;
-            }
-            cWarning() << "FAT32 filesystem is too small (" << size << "bytes)";
-            return false;
+    case FileSystem::Type::Fat32:
+        if ( size >= 300_MiB )
+        {
+            return true;
+        }
+        cWarning() << "FAT32 filesystem is too small (" << size << "bytes)";
+        return false;
 #ifdef WITH_KPMCORE4API
-        case FileSystem::Type::Fat12:
+    case FileSystem::Type::Fat12:
 #endif
-        case FileSystem::Type::Fat16:
-            cWarning() << "FAT12 and FAT16 are probably not supported by EFI";
-            return false;
-        default:
-            cWarning() << "EFI boot partition must be FAT32";
-            return false;
+    case FileSystem::Type::Fat16:
+        cWarning() << "FAT12 and FAT16 are probably not supported by EFI";
+        return false;
+    default:
+        cWarning() << "EFI boot partition must be FAT32";
+        return false;
     }
 }
 
diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 233f5117a..8ae904e92 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -138,61 +138,63 @@ PartitionLayout::init( FileSystem::Type defaultFsType, const QVariantList& confi
 }
 
 void
-PartitionLayout::setDefaultFsType(FileSystem::Type defaultFsType)
+PartitionLayout::setDefaultFsType( FileSystem::Type defaultFsType )
 {
     using FileSystem = FileSystem::Type;
     switch ( defaultFsType )
     {
-        case FileSystem::Unknown:
-        case FileSystem::Unformatted:
-        case FileSystem::Extended:
-        case FileSystem::LinuxSwap:
-        case FileSystem::Luks:
-        case FileSystem::Ocfs2:
-        case FileSystem::Lvm2_PV:
-        case FileSystem::Udf:
-        case FileSystem::Iso9660:
+    case FileSystem::Unknown:
+    case FileSystem::Unformatted:
+    case FileSystem::Extended:
+    case FileSystem::LinuxSwap:
+    case FileSystem::Luks:
+    case FileSystem::Ocfs2:
+    case FileSystem::Lvm2_PV:
+    case FileSystem::Udf:
+    case FileSystem::Iso9660:
 #ifdef WITH_KPMCORE4API
-        case FileSystem::Luks2:
-        case FileSystem::LinuxRaidMember:
-        case FileSystem::BitLocker:
+    case FileSystem::Luks2:
+    case FileSystem::LinuxRaidMember:
+    case FileSystem::BitLocker:
 #endif
-            // bad bad
-            cWarning() << "The selected default FS" << defaultFsType << "is not suitable." << "Using ext4 instead.";
-            defaultFsType = FileSystem::Ext4;
-            break;
-        case FileSystem::Ext2:
-        case FileSystem::Ext3:
-        case FileSystem::Ext4:
-        case FileSystem::Fat32:
-        case FileSystem::Ntfs:
-        case FileSystem::Reiser4:
-        case FileSystem::ReiserFS:
-        case FileSystem::Xfs:
-        case FileSystem::Jfs:
-        case FileSystem::Btrfs:
-        case FileSystem::Exfat:
-        case FileSystem::F2fs:
-            // ok
-            break;
-        case FileSystem::Fat16:
-        case FileSystem::Hfs:
-        case FileSystem::HfsPlus:
-        case FileSystem::Ufs:
-        case FileSystem::Hpfs:
-        case FileSystem::Zfs:
-        case FileSystem::Nilfs2:
+        // bad bad
+        cWarning() << "The selected default FS" << defaultFsType << "is not suitable."
+                   << "Using ext4 instead.";
+        defaultFsType = FileSystem::Ext4;
+        break;
+    case FileSystem::Ext2:
+    case FileSystem::Ext3:
+    case FileSystem::Ext4:
+    case FileSystem::Fat32:
+    case FileSystem::Ntfs:
+    case FileSystem::Reiser4:
+    case FileSystem::ReiserFS:
+    case FileSystem::Xfs:
+    case FileSystem::Jfs:
+    case FileSystem::Btrfs:
+    case FileSystem::Exfat:
+    case FileSystem::F2fs:
+        // ok
+        break;
+    case FileSystem::Fat16:
+    case FileSystem::Hfs:
+    case FileSystem::HfsPlus:
+    case FileSystem::Ufs:
+    case FileSystem::Hpfs:
+    case FileSystem::Zfs:
+    case FileSystem::Nilfs2:
 #ifdef WITH_KPMCORE4API
-        case FileSystem::Fat12:
-        case FileSystem::Apfs:
-        case FileSystem::Minix:
+    case FileSystem::Fat12:
+    case FileSystem::Apfs:
+    case FileSystem::Minix:
 #endif
-            // weird
-            cWarning() << "The selected default FS" << defaultFsType << "is unusual, but not wrong.";
-            break;
-        default:
-            cWarning() << "The selected default FS" << defaultFsType << "is not known to Calamares." << "Using ext4 instead.";
-            defaultFsType = FileSystem::Ext4;
+        // weird
+        cWarning() << "The selected default FS" << defaultFsType << "is unusual, but not wrong.";
+        break;
+    default:
+        cWarning() << "The selected default FS" << defaultFsType << "is not known to Calamares."
+                   << "Using ext4 instead.";
+        defaultFsType = FileSystem::Ext4;
     }
 
     m_defaultFsType = defaultFsType;
@@ -278,7 +280,7 @@ PartitionLayout::createPartitions( Device* dev,
         }
     }
 
-    auto correctFS = [d=m_defaultFsType]( FileSystem::Type t ) { return t == FileSystem::Type::Unknown ? d : t; };
+    auto correctFS = [d = m_defaultFsType]( FileSystem::Type t ) { return t == FileSystem::Type::Unknown ? d : t; };
 
     // Create the partitions.
     currentSector = firstSector;
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 6438724e8..27c2cd710 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -270,11 +270,12 @@ ChoicePage::setupChoices()
         m_eraseButton->addOptionsComboBox( m_eraseSwapChoiceComboBox );
     }
 
-    if ( m_config->eraseFsTypes().count() > 1)
+    if ( m_config->eraseFsTypes().count() > 1 )
     {
         m_eraseFsTypesChoiceComboBox = new QComboBox;
-        m_eraseFsTypesChoiceComboBox->addItems(m_config->eraseFsTypes());
-        connect( m_eraseFsTypesChoiceComboBox, &QComboBox::currentTextChanged, m_config, &Config::setEraseFsTypeChoice );
+        m_eraseFsTypesChoiceComboBox->addItems( m_config->eraseFsTypes() );
+        connect(
+            m_eraseFsTypesChoiceComboBox, &QComboBox::currentTextChanged, m_config, &Config::setEraseFsTypeChoice );
         connect( m_config, &Config::eraseModeFilesystemChanged, this, &ChoicePage::onActionChanged );
         m_eraseButton->addOptionsComboBox( m_eraseFsTypesChoiceComboBox );
     }