diff --git a/.clang-format b/.clang-format
index f059f2fde..997ad379b 100644
--- a/.clang-format
+++ b/.clang-format
@@ -6,7 +6,7 @@ AllowAllParametersOfDeclarationOnNextLine: 'false'
 AllowShortFunctionsOnASingleLine: Inline
 AllowShortIfStatementsOnASingleLine: 'false'
 AllowShortLoopsOnASingleLine: 'false'
-AlwaysBreakAfterDefinitionReturnType: All
+AlwaysBreakAfterReturnType: TopLevelDefinitions
 AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: 'false'
 BinPackParameters: 'false'
diff --git a/src/libcalamares/partition/PartitionSize.h b/src/libcalamares/partition/PartitionSize.h
index 27f354516..44cedbffe 100644
--- a/src/libcalamares/partition/PartitionSize.h
+++ b/src/libcalamares/partition/PartitionSize.h
@@ -60,11 +60,7 @@ public:
     }
     PartitionSize( const QString& );
 
-    bool
-    isValid() const
-    {
-        return ( unit() != SizeUnit::None ) && ( value() > 0 );
-    }
+    bool isValid() const { return ( unit() != SizeUnit::None ) && ( value() > 0 ); }
 
     bool operator<( const PartitionSize& other ) const;
     bool operator>( const PartitionSize& other ) const;
@@ -114,8 +110,7 @@ public:
      * be compared with each other, and all the explicit sizes (KiB, ...)
      * can be compared with each other.
      */
-    static constexpr bool
-    unitsComparable( const SizeUnit u1, const SizeUnit u2 )
+    static constexpr bool unitsComparable( const SizeUnit u1, const SizeUnit u2 )
     {
         return !( ( u1 == SizeUnit::None || u2 == SizeUnit::None )
                   || ( u1 == SizeUnit::Percent && u2 != SizeUnit::Percent )