diff --git a/src/androidlogging.h b/src/androidlogging.h
index 9ab336fb..165e5ffd 100644
--- a/src/androidlogging.h
+++ b/src/androidlogging.h
@@ -8,29 +8,28 @@
 
 #include <android/log.h>
 
-const char *applicationName="org.kde.kasts";
-void myMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString& msg)
+const char *applicationName = "org.kde.kasts";
+void myMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
 {
     QByteArray localMsg = msg.toLocal8Bit();
     // const char *file = context.file ? context.file : "";
     // const char *function = context.function ? context.function : "";
     switch (type) {
     case QtDebugMsg:
-        __android_log_write(ANDROID_LOG_DEBUG,applicationName,localMsg.constData());
+        __android_log_write(ANDROID_LOG_DEBUG, applicationName, localMsg.constData());
         break;
     case QtInfoMsg:
-        __android_log_write(ANDROID_LOG_INFO,applicationName,localMsg.constData());
+        __android_log_write(ANDROID_LOG_INFO, applicationName, localMsg.constData());
         break;
     case QtWarningMsg:
-        __android_log_write(ANDROID_LOG_WARN,applicationName,localMsg.constData());
+        __android_log_write(ANDROID_LOG_WARN, applicationName, localMsg.constData());
         break;
     case QtCriticalMsg:
-        __android_log_write(ANDROID_LOG_ERROR,applicationName,localMsg.constData());
+        __android_log_write(ANDROID_LOG_ERROR, applicationName, localMsg.constData());
         break;
     case QtFatalMsg:
     default:
-        __android_log_write(ANDROID_LOG_FATAL,applicationName,localMsg.constData());
+        __android_log_write(ANDROID_LOG_FATAL, applicationName, localMsg.constData());
         abort();
     }
 }
-
diff --git a/src/datamanager.cpp b/src/datamanager.cpp
index 861f4f72..e83db2d8 100644
--- a/src/datamanager.cpp
+++ b/src/datamanager.cpp
@@ -5,9 +5,9 @@
  */
 
 #include "datamanager.h"
-#include "datamanagerlogging.h"
 #include "audiomanager.h"
 #include "database.h"
+#include "datamanagerlogging.h"
 #include "fetcher.h"
 #include "settingsmanager.h"
 #include <QDateTime>
diff --git a/src/downloadprogressmodel.cpp b/src/downloadprogressmodel.cpp
index 9b03e4ed..8d6c4e5c 100644
--- a/src/downloadprogressmodel.cpp
+++ b/src/downloadprogressmodel.cpp
@@ -5,8 +5,8 @@
  */
 
 #include "downloadprogressmodel.h"
-#include "downloadprogressmodellogging.h"
 #include "datamanager.h"
+#include "downloadprogressmodellogging.h"
 
 DownloadProgressModel::DownloadProgressModel()
     : QAbstractListModel(nullptr)