diff --git a/modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp
index 75e3298d3d..479c3330c7 100644
--- a/modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp
+++ b/modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp
@@ -1562,7 +1562,8 @@ struct MP3Stream
 
             if (result < 0)
                 return false;
-            else if (result > 0)
+
+            if (result > 0)
                 break;
         }
 
@@ -3052,7 +3053,8 @@ private:
                 createEmptyDecodedData();
                 return true;
             }
-            else if (result <= 0)
+
+            if (result <= 0)
             {
                 decodedStart = 0;
                 decodedEnd = samplesDone;
diff --git a/modules/juce_audio_formats/format/juce_AudioFormatWriter.h b/modules/juce_audio_formats/format/juce_AudioFormatWriter.h
index b4759f3ff3..48041099ee 100644
--- a/modules/juce_audio_formats/format/juce_AudioFormatWriter.h
+++ b/modules/juce_audio_formats/format/juce_AudioFormatWriter.h
@@ -219,7 +219,7 @@ protected:
     /** True if it's a floating-point format, false if it's fixed-point. */
     bool usesFloatingPointData;
 
-    /** The output stream for Use by subclasses. */
+    /** The output stream for use by subclasses. */
     OutputStream* output;
 
     /** Used by AudioFormatWriter subclasses to copy data to different formats. */
diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessor.h b/modules/juce_audio_processors/processors/juce_AudioProcessor.h
index e7098fe542..76ac472759 100644
--- a/modules/juce_audio_processors/processors/juce_AudioProcessor.h
+++ b/modules/juce_audio_processors/processors/juce_AudioProcessor.h
@@ -328,10 +328,8 @@ public:
     */
     bool isNonRealtime() const noexcept                                 { return nonRealtime; }
 
-    /** Called by the host to tell this processor whether it's being used in a non-realime
+    /** Called by the host to tell this processor whether it's being used in a non-realtime
         capacity for offline rendering or bouncing.
-
-        Whatever value is passed-in will be
     */
     void setNonRealtime (bool isNonRealtime) noexcept;
 
diff --git a/modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp b/modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp
index 65e36a72c5..02ad1106ab 100644
--- a/modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp
+++ b/modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp
@@ -220,9 +220,7 @@ namespace DirectWriteTypeLayout
         range.startPosition = attr.range.getStart();
         range.length = jmin (attr.range.getLength(), textLen - attr.range.getStart());
 
-        const Font* const font = attr.getFont();
-
-        if (font != nullptr)
+        if (const Font* const font = attr.getFont())
         {
             BOOL fontFound = false;
             uint32 fontIndex;
@@ -256,13 +254,13 @@ namespace DirectWriteTypeLayout
             textLayout->SetFontSize (font->getHeight() * fontHeightToEmSizeFactor, range);
         }
 
-        if (attr.getColour() != nullptr)
+        if (const Colour* const colour = attr.getColour())
         {
             ComSmartPtr<ID2D1SolidColorBrush> d2dBrush;
-            renderTarget->CreateSolidColorBrush (D2D1::ColorF (D2D1::ColorF (attr.getColour()->getFloatRed(),
-                                                                             attr.getColour()->getFloatGreen(),
-                                                                             attr.getColour()->getFloatBlue(),
-                                                                             attr.getColour()->getFloatAlpha())),
+            renderTarget->CreateSolidColorBrush (D2D1::ColorF (D2D1::ColorF (colour->getFloatRed(),
+                                                                             colour->getFloatGreen(),
+                                                                             colour->getFloatBlue(),
+                                                                             colour->getFloatAlpha())),
                                                  d2dBrush.resetAndGetPointerAddress());
 
             // We need to call SetDrawingEffect with a legimate brush to get DirectWrite to break text based on colours