diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp
index cf7984c87..ecca466fe 100644
--- a/src/libcalamares/PythonJobApi.cpp
+++ b/src/libcalamares/PythonJobApi.cpp
@@ -65,9 +65,9 @@ mount( const std::string& device_path,
        const std::string& options )
 {
     return CalamaresUtils::Partition::mount( QString::fromStdString( device_path ),
-                  QString::fromStdString( mount_point ),
-                  QString::fromStdString( filesystem_name ),
-                  QString::fromStdString( options ) );
+                                             QString::fromStdString( mount_point ),
+                                             QString::fromStdString( filesystem_name ),
+                                             QString::fromStdString( options ) );
 }
 
 
diff --git a/src/libcalamares/modulesystem/InstanceKey.h b/src/libcalamares/modulesystem/InstanceKey.h
index 495401903..724827330 100644
--- a/src/libcalamares/modulesystem/InstanceKey.h
+++ b/src/libcalamares/modulesystem/InstanceKey.h
@@ -94,8 +94,7 @@ private:
     }
 };
 
-QDebug&
-operator <<( QDebug& s, const Calamares::ModuleSystem::InstanceKey& i );
+QDebug& operator<<( QDebug& s, const Calamares::ModuleSystem::InstanceKey& i );
 
 }  // namespace ModuleSystem
 }  // namespace Calamares
diff --git a/src/libcalamares/modulesystem/Tests.cpp b/src/libcalamares/modulesystem/Tests.cpp
index e7301a0be..b1fab7ffc 100644
--- a/src/libcalamares/modulesystem/Tests.cpp
+++ b/src/libcalamares/modulesystem/Tests.cpp
@@ -138,4 +138,5 @@ ModuleSystemTests::testBadFromStringCases()
 QTEST_GUILESS_MAIN( ModuleSystemTests )
 
 #include "utils/moc-warnings.h"
+
 #include "Tests.moc"
diff --git a/src/libcalamares/network/Manager.cpp b/src/libcalamares/network/Manager.cpp
index 1d58efba9..6e8a1e93d 100644
--- a/src/libcalamares/network/Manager.cpp
+++ b/src/libcalamares/network/Manager.cpp
@@ -286,4 +286,5 @@ Manager::asynchronousGet( const QUrl& url, const CalamaresUtils::Network::Reques
 }  // namespace CalamaresUtils
 
 #include "utils/moc-warnings.h"
+
 #include "Manager.moc"
diff --git a/src/libcalamares/network/Tests.cpp b/src/libcalamares/network/Tests.cpp
index 830545b96..dc893a9c9 100644
--- a/src/libcalamares/network/Tests.cpp
+++ b/src/libcalamares/network/Tests.cpp
@@ -47,6 +47,7 @@ NetworkTests::testPing()
     using namespace CalamaresUtils::Network;
     Logger::setupLogLevel( Logger::LOGVERBOSE );
     auto& nam = Manager::instance();
-    auto canPing_www_kde_org = nam.synchronousPing( QUrl( "https://www.kde.org" ), RequestOptions( RequestOptions::FollowRedirect ) );
+    auto canPing_www_kde_org
+        = nam.synchronousPing( QUrl( "https://www.kde.org" ), RequestOptions( RequestOptions::FollowRedirect ) );
     QVERIFY( canPing_www_kde_org );
 }
diff --git a/src/libcalamares/utils/RAII.h b/src/libcalamares/utils/RAII.h
index cff97bcef..4d8210a25 100644
--- a/src/libcalamares/utils/RAII.h
+++ b/src/libcalamares/utils/RAII.h
@@ -24,14 +24,14 @@
 #include <type_traits>
 
 /// @brief Convenience to zero out and deleteLater of any QObject-derived-class
-template< typename T >
+template < typename T >
 struct cqDeleter
 {
     T*& p;
 
     ~cqDeleter()
     {
-        static_assert( std::is_base_of<QObject, T>::value, "Not a QObject-class" );
+        static_assert( std::is_base_of< QObject, T >::value, "Not a QObject-class" );
         if ( p )
         {
             p->deleteLater();