diff --git a/es-app/src/MiximageGenerator.cpp b/es-app/src/MiximageGenerator.cpp
index d16105bef..12e2f6f4a 100644
--- a/es-app/src/MiximageGenerator.cpp
+++ b/es-app/src/MiximageGenerator.cpp
@@ -627,7 +627,7 @@ void MiximageGenerator::sampleFrameColor(CImg<unsigned char>& screenshotImage,
     // Convert to the HSL color space to be able to modify saturation and lightness.
     CImg<float> colorHSL = CImg<>(1, 1, 1, 3).fill(redC, greenC, blueC).RGBtoHSL();
 
-    float hue = colorHSL(0, 0, 0, 0);
+    // float hue = colorHSL(0, 0, 0, 0);
     float saturation = colorHSL(0, 0, 0, 1);
     float lightness = colorHSL(0, 0, 0, 2);
 
diff --git a/es-core/src/AudioManager.cpp b/es-core/src/AudioManager.cpp
index 8ca75fa41..b3f9e7632 100644
--- a/es-core/src/AudioManager.cpp
+++ b/es-core/src/AudioManager.cpp
@@ -307,17 +307,14 @@ void AudioManager::clearStream()
     //    SDL_AudioStreamClear(sConversionStream);
 
     mIsClearingStream = true;
-
-    int streamSize;
     int length = sAudioFormat.samples * 4;
 
-    while ((streamSize = SDL_AudioStreamAvailable(sConversionStream)) > 0) {
+    while (SDL_AudioStreamAvailable(sConversionStream) > 0) {
         std::vector<Uint8> readBuffer(length);
         int processedLength =
             SDL_AudioStreamGet(sConversionStream, static_cast<void*>(&readBuffer.at(0)), length);
-        if (processedLength <= 0) {
+        if (processedLength <= 0)
             break;
-        }
     }
 
     mIsClearingStream = false;
diff --git a/es-core/src/Scripting.cpp b/es-core/src/Scripting.cpp
index 5e3cd926f..dadb3db36 100644
--- a/es-core/src/Scripting.cpp
+++ b/es-core/src/Scripting.cpp
@@ -37,11 +37,9 @@ namespace Scripting
         if (Utils::FileSystem::exists(scriptDir))
             scriptDirList.push_back(scriptDir);
 
-        for (std::list<std::string>::const_iterator dirIt = scriptDirList.cbegin();
-             dirIt != scriptDirList.cend(); dirIt++) {
+        for (auto dirIt = scriptDirList.cbegin(); dirIt != scriptDirList.cend(); dirIt++) {
             std::list<std::string> scripts = Utils::FileSystem::getDirContent(*dirIt);
-            for (std::list<std::string>::const_iterator it = scripts.cbegin(); // Line break.
-                 it != scripts.cend(); it++) {
+            for (auto it = scripts.cbegin(); it != scripts.cend(); it++) {
                 std::string arg1Quotation;
                 std::string arg2Quotation;
                 // Add quotation marks around the arguments as long as these are not already
@@ -50,8 +48,16 @@ namespace Scripting
                     arg1Quotation = "\"";
                 if (arg2.front() != '\"')
                     arg2Quotation = "\"";
-                std::string script = *it + " " + arg1Quotation + arg1 + arg1Quotation + " " +
-                                     arg2Quotation + arg2 + arg2Quotation;
+                std::string script;
+                script.append(*it)
+                    .append(" ")
+                    .append(arg1Quotation)
+                    .append(arg1)
+                    .append(arg1Quotation)
+                    .append(" ")
+                    .append(arg2Quotation)
+                    .append(arg2)
+                    .append(arg2Quotation);
                 LOG(LogDebug) << "Executing: " << script;
                 runSystemCommand(script);
             }