diff --git a/src/model/profile/profileinfo.cpp b/src/model/profile/profileinfo.cpp
index bd9ccb1bc..73635325e 100644
--- a/src/model/profile/profileinfo.cpp
+++ b/src/model/profile/profileinfo.cpp
@@ -342,8 +342,8 @@ IProfileInfo::SetAvatarResult ProfileInfo::byteArrayToPng(QByteArray inData, QBy
     }
 
     if (format == "png") {
-        // FIXME: re-encode the png even though inData is already valid. This strips the metadata since
-        // we don't have a good png metadata stripping method currently.
+        // FIXME: re-encode the png even though inData is already valid. This strips the metadata
+        // since we don't have a good png metadata stripping method currently.
         outPng = picToPng(image);
     } else {
         outPng = picToPng(image);
diff --git a/src/persistence/profile.h b/src/persistence/profile.h
index 4e14c522e..6b8c9dd08 100644
--- a/src/persistence/profile.h
+++ b/src/persistence/profile.h
@@ -97,7 +97,8 @@ private slots:
     void onAvatarOfferReceived(uint32_t friendId, uint32_t fileId, const QByteArray& avatarHash);
 
 private:
-    Profile(QString name, const QString& password, bool newProfile, const QByteArray& toxsave, std::unique_ptr<ToxEncrypt> passKey);
+    Profile(QString name, const QString& password, bool newProfile, const QByteArray& toxsave,
+            std::unique_ptr<ToxEncrypt> passKey);
     static QStringList getFilesByExt(QString extension);
     QString avatarPath(const ToxPk& owner, bool forceUnencrypted = false);
     bool saveToxSave(QByteArray data);
diff --git a/src/persistence/settings.cpp b/src/persistence/settings.cpp
index 030521a3d..44344137e 100644
--- a/src/persistence/settings.cpp
+++ b/src/persistence/settings.cpp
@@ -143,9 +143,11 @@ void Settings::loadGlobal()
         }
         autoAwayTime = s.value("autoAwayTime", 10).toInt();
         checkUpdates = s.value("checkUpdates", true).toBool();
-        notifySound = s.value("notifySound", true).toBool(); // note: notifySound and busySound UI elements are now under UI settings
+        // note: notifySound and busySound UI elements are now under UI settings
+        // page, but kept under General in settings file to be backwards compatible
+        notifySound = s.value("notifySound", true).toBool();
         notifyHide = s.value("notifyHide", false).toBool();
-        busySound = s.value("busySound", false).toBool();    // page, but kept under General in settings file to be backwards compatible
+        busySound = s.value("busySound", false).toBool();
         autoSaveEnabled = s.value("autoSaveEnabled", false).toBool();
         globalAutoAcceptDir = s.value("globalAutoAcceptDir",
                                       QStandardPaths::locate(QStandardPaths::HomeLocation, QString(),
@@ -338,7 +340,7 @@ void Settings::loadPersonal(QString profileName, const ToxEncrypt* passKey)
             fp.circleID = ps.value("circle", -1).toInt();
 
             if (getEnableLogging())
-                fp.activity = ps.value("activity",  QDateTime()).toDateTime();
+                fp.activity = ps.value("activity", QDateTime()).toDateTime();
             friendLst.insert(ToxId(fp.addr).getPublicKey().getByteArray(), fp);
         }
         ps.endArray();
@@ -365,7 +367,8 @@ void Settings::loadPersonal(QString profileName, const ToxEncrypt* passKey)
     ps.beginGroup("GUI");
     {
         compactLayout = ps.value("compactLayout", true).toBool();
-        sortingMode = static_cast<FriendListSortingMode>(ps.value("friendSortingMethod", static_cast<int>(FriendListSortingMode::Name)).toInt());
+        sortingMode = static_cast<FriendListSortingMode>(
+            ps.value("friendSortingMethod", static_cast<int>(FriendListSortingMode::Name)).toInt());
     }
     ps.endGroup();