diff --git a/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp b/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp
index 195f47ae6c..1f523f3c1a 100644
--- a/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp
+++ b/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp
@@ -33,8 +33,8 @@
  class AUScanner
  {
  public:
-     AUScanner (KnownPluginList& list)
-         : knownPluginList (list), pool (5)
+     explicit AUScanner (KnownPluginList& list)
+         : knownPluginList (list)
      {
          knownPluginList.clearBlacklistedFiles();
          paths = formatToScan.getDefaultLocationsToSearch();
@@ -49,7 +49,8 @@
      std::unique_ptr<PluginDirectoryScanner> scanner;
      FileSearchPath paths;
 
-     ThreadPool pool;
+     static constexpr auto numJobs = 5;
+     ThreadPool pool { numJobs };
 
      void startScan()
      {
@@ -59,17 +60,14 @@
          scanner.reset (new PluginDirectoryScanner (knownPluginList, formatToScan, paths,
                                                     true, deadMansPedalFile, true));
 
-         for (int i = 5; --i >= 0;)
+         for (int i = numJobs; --i >= 0;)
              pool.addJob (new ScanJob (*this), true);
      }
 
      bool doNextScan()
      {
          String pluginBeingScanned;
-         if (scanner->scanNextFile (true, pluginBeingScanned))
-             return true;
-
-         return false;
+         return scanner->scanNextFile (true, pluginBeingScanned);
      }
 
      struct ScanJob  : public ThreadPoolJob