diff --git a/src/emucore/AtariVox.cxx b/src/emucore/AtariVox.cxx
index 95065cbec..fb13408b4 100644
--- a/src/emucore/AtariVox.cxx
+++ b/src/emucore/AtariVox.cxx
@@ -25,7 +25,7 @@ AtariVox::AtariVox(Jack jack, const Event& event, const System& system,
                    const string& portname, const FilesystemNode& eepromfile,
                    const onMessageCallback& callback)
   : SaveKey(jack, event, system, eepromfile, callback, Controller::Type::AtariVox),
-    mySerialPort(MediaFactory::createSerialPort())
+    mySerialPort{MediaFactory::createSerialPort()}
 {
   if(mySerialPort->openPort(portname))
   {
diff --git a/src/emucore/Cart.cxx b/src/emucore/Cart.cxx
index d4b5c5c22..b834c7cf8 100644
--- a/src/emucore/Cart.cxx
+++ b/src/emucore/Cart.cxx
@@ -28,7 +28,7 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Cartridge::Cartridge(const Settings& settings, const string& md5)
-  : mySettings(settings)
+  : mySettings{settings}
 {
   auto to_uInt32 = [](const string& s, uInt32 pos) {
     return uInt32(std::stoul(s.substr(pos, 8), nullptr, 16));
diff --git a/src/emucore/Cart3F.hxx b/src/emucore/Cart3F.hxx
index fee14e97e..8ea72cc4d 100644
--- a/src/emucore/Cart3F.hxx
+++ b/src/emucore/Cart3F.hxx
@@ -66,7 +66,6 @@ class Cartridge3F : public CartridgeEnhanced
     */
     void install(System& system) override;
 
-
     /**
       Get a descriptor for the device name (used in error checking).
 
diff --git a/src/emucore/Cart4A50.cxx b/src/emucore/Cart4A50.cxx
index 6939bc0ef..b060c0d20 100644
--- a/src/emucore/Cart4A50.cxx
+++ b/src/emucore/Cart4A50.cxx
@@ -24,8 +24,8 @@
 Cartridge4A50::Cartridge4A50(const ByteBuffer& image, size_t size,
                              const string& md5, const Settings& settings)
   : Cartridge(settings, md5),
-    myImage(make_unique<uInt8[]>(128_KB)),
-    mySize(size)
+    myImage{make_unique<uInt8[]>(128_KB)},
+    mySize{size}
 {
   // Copy the ROM image into my buffer
   // Supported file sizes are 32/64/128K, which are duplicated if necessary
diff --git a/src/emucore/CartAR.cxx b/src/emucore/CartAR.cxx
index cc58d60be..2cd39c863 100644
--- a/src/emucore/CartAR.cxx
+++ b/src/emucore/CartAR.cxx
@@ -24,7 +24,7 @@
 CartridgeAR::CartridgeAR(const ByteBuffer& image, size_t size,
                          const string& md5, const Settings& settings)
   : Cartridge(settings, md5),
-    mySize(std::max<size_t>(size, 8448))
+    mySize{std::max<size_t>(size, 8448)}
 {
   // Create a load image buffer and copy the given image
   myLoadImages = make_unique<uInt8[]>(mySize);
diff --git a/src/emucore/CartBUS.cxx b/src/emucore/CartBUS.cxx
index 688c4b974..28645d270 100644
--- a/src/emucore/CartBUS.cxx
+++ b/src/emucore/CartBUS.cxx
@@ -44,7 +44,7 @@
 CartridgeBUS::CartridgeBUS(const ByteBuffer& image, size_t size,
                            const string& md5, const Settings& settings)
   : Cartridge(settings, md5),
-    myImage(make_unique<uInt8[]>(32_KB))
+    myImage{make_unique<uInt8[]>(32_KB)}
 {
   // Copy the ROM image into my buffer
   std::copy_n(image.get(), std::min(32_KB, size), myImage.get());
@@ -71,8 +71,8 @@ CartridgeBUS::CartridgeBUS(const ByteBuffer& image, size_t size,
     0x00000800,
     0x00000808,
     0x40001FDC,
-    devSettings ? settings.getBool("dev.thumb.trapfatal") : false, 
-    Thumbulator::ConfigureFor::BUS, 
+    devSettings ? settings.getBool("dev.thumb.trapfatal") : false,
+    Thumbulator::ConfigureFor::BUS,
     this);
 
   setInitialState();
diff --git a/src/emucore/CartCDF.cxx b/src/emucore/CartCDF.cxx
index 895857ec0..9876485e6 100644
--- a/src/emucore/CartCDF.cxx
+++ b/src/emucore/CartCDF.cxx
@@ -66,7 +66,7 @@ namespace {
 CartridgeCDF::CartridgeCDF(const ByteBuffer& image, size_t size,
                            const string& md5, const Settings& settings)
   : Cartridge(settings, md5),
-    myImage(make_unique<uInt8[]>(512_KB))
+    myImage{make_unique<uInt8[]>(512_KB)}
 {
   // Copy the ROM image into my buffer
   std::fill_n(myImage.get(), 512_KB, 0);
diff --git a/src/emucore/CartCM.cxx b/src/emucore/CartCM.cxx
index dbaac7a54..da429a876 100644
--- a/src/emucore/CartCM.cxx
+++ b/src/emucore/CartCM.cxx
@@ -24,7 +24,7 @@
 CartridgeCM::CartridgeCM(const ByteBuffer& image, size_t size,
                          const string& md5, const Settings& settings)
   : Cartridge(settings, md5),
-    myImage(make_unique<uInt8[]>(16_KB))
+    myImage{make_unique<uInt8[]>(16_KB)}
 {
   // Copy the ROM image into my buffer
   std::copy_n(image.get(), std::min(16_KB, size), myImage.get());
diff --git a/src/emucore/CartCTY.cxx b/src/emucore/CartCTY.cxx
index 67647f89c..1056306aa 100644
--- a/src/emucore/CartCTY.cxx
+++ b/src/emucore/CartCTY.cxx
@@ -25,7 +25,7 @@
 CartridgeCTY::CartridgeCTY(const ByteBuffer& image, size_t size,
                            const string& md5, const Settings& settings)
   : Cartridge(settings, md5),
-    myImage(make_unique<uInt8[]>(32_KB))
+    myImage{make_unique<uInt8[]>(32_KB)}
 {
   // Copy the ROM image into my buffer
   std::copy_n(image.get(), std::min(32_KB, size), myImage.get());
diff --git a/src/emucore/CartDPCPlus.cxx b/src/emucore/CartDPCPlus.cxx
index 0b750fdde..d7a700241 100644
--- a/src/emucore/CartDPCPlus.cxx
+++ b/src/emucore/CartDPCPlus.cxx
@@ -29,8 +29,8 @@
 CartridgeDPCPlus::CartridgeDPCPlus(const ByteBuffer& image, size_t size,
                                    const string& md5, const Settings& settings)
   : Cartridge(settings, md5),
-    myImage(make_unique<uInt8[]>(32_KB)),
-    mySize(std::min(size, 32_KB))
+    myImage{make_unique<uInt8[]>(32_KB)},
+    mySize{std::min(size, 32_KB)}
 {
   // Image is always 32K, but in the case of ROM < 32K, the image is
   // copied to the end of the buffer
diff --git a/src/emucore/CartMNetwork.cxx b/src/emucore/CartMNetwork.cxx
index 78c68e6a0..e4eada8c8 100644
--- a/src/emucore/CartMNetwork.cxx
+++ b/src/emucore/CartMNetwork.cxx
@@ -22,7 +22,7 @@
 CartridgeMNetwork::CartridgeMNetwork(const ByteBuffer& image, size_t size,
                                      const string& md5, const Settings& settings)
   : Cartridge(settings, md5),
-    mySize(size)
+    mySize{size}
 {
 }
 
diff --git a/src/emucore/CartUA.cxx b/src/emucore/CartUA.cxx
index 83afca20e..5f93a16e5 100644
--- a/src/emucore/CartUA.cxx
+++ b/src/emucore/CartUA.cxx
@@ -23,7 +23,7 @@ CartridgeUA::CartridgeUA(const ByteBuffer& image, size_t size,
                          const string& md5, const Settings& settings,
                          bool swapHotspots)
   : CartridgeEnhanced(image, size, md5, settings, 8_KB),
-    mySwappedHotspots(swapHotspots)
+    mySwappedHotspots{swapHotspots}
 {
 }
 
diff --git a/src/emucore/CartWD.hxx b/src/emucore/CartWD.hxx
index de4cbd68d..af233a92c 100644
--- a/src/emucore/CartWD.hxx
+++ b/src/emucore/CartWD.hxx
@@ -168,7 +168,7 @@ class CartridgeWD : public CartridgeEnhanced
 
     // The arrangement of banks to use on each hotspot read
     struct BankOrg {
-      uInt8 zero, one, two, three;
+      uInt8 zero{0}, one{0}, two{0}, three{0};
     };
     static const std::array<BankOrg, 8> ourBankOrg;
 
diff --git a/src/emucore/CompuMate.cxx b/src/emucore/CompuMate.cxx
index a3a0367cc..9aeb688fe 100644
--- a/src/emucore/CompuMate.cxx
+++ b/src/emucore/CompuMate.cxx
@@ -23,8 +23,8 @@
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 CompuMate::CompuMate(const Console& console, const Event& event,
                      const System& system)
-  : myConsole(console),
-    myEvent(event)
+  : myConsole{console},
+    myEvent{event}
 {
   // These controller pointers will be retrieved by the Console, which will
   // also take ownership of them
diff --git a/src/emucore/CompuMate.hxx b/src/emucore/CompuMate.hxx
index e9a9a047e..d1460e59d 100644
--- a/src/emucore/CompuMate.hxx
+++ b/src/emucore/CompuMate.hxx
@@ -86,7 +86,7 @@ class CompuMate
         CMControl(class CompuMate& handler, Controller::Jack jack, const Event& event,
                   const System& system)
           : Controller(jack, event, system, Controller::Type::CompuMate),
-            myHandler(handler) { }
+            myHandler{handler} { }
         ~CMControl() override = default;
 
       public:
diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx
index 48efdd777..52620243e 100644
--- a/src/emucore/Console.cxx
+++ b/src/emucore/Console.cxx
@@ -116,11 +116,11 @@ namespace {
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Console::Console(OSystem& osystem, unique_ptr<Cartridge>& cart,
                  const Properties& props, AudioSettings& audioSettings)
-  : myOSystem(osystem),
-    myEvent(osystem.eventHandler().event()),
-    myProperties(props),
-    myCart(std::move(cart)),
-    myAudioSettings(audioSettings)
+  : myOSystem{osystem},
+    myEvent{osystem.eventHandler().event()},
+    myProperties{props},
+    myCart{std::move(cart)},
+    myAudioSettings{audioSettings}
 {
   // Create subsystems for the console
   my6502 = make_unique<M6502>(myOSystem.settings());
diff --git a/src/emucore/Console.hxx b/src/emucore/Console.hxx
index 21c979ae4..e30ef9d37 100644
--- a/src/emucore/Console.hxx
+++ b/src/emucore/Console.hxx
@@ -74,14 +74,9 @@ class Console : public Serializable, public ConsoleIO
     */
     Console(OSystem& osystem, unique_ptr<Cartridge>& cart,
             const Properties& props, AudioSettings& audioSettings);
-
-    /**
-      Destructor
-    */
     ~Console() override;
 
   public:
-
     /**
       Sets the left and right controllers for the console.
     */
diff --git a/src/emucore/Control.cxx b/src/emucore/Control.cxx
index fb57b6278..b5ef97e6d 100644
--- a/src/emucore/Control.cxx
+++ b/src/emucore/Control.cxx
@@ -23,10 +23,10 @@
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Controller::Controller(Jack jack, const Event& event, const System& system,
                        Type type)
-  : myJack(jack),
-    myEvent(event),
-    mySystem(system),
-    myType(type)
+  : myJack{jack},
+    myEvent{event},
+    mySystem{system},
+    myType{type}
 {
 }
 
diff --git a/src/emucore/EmulationTiming.cxx b/src/emucore/EmulationTiming.cxx
index 98ad0c88f..cfa81c3a7 100644
--- a/src/emucore/EmulationTiming.cxx
+++ b/src/emucore/EmulationTiming.cxx
@@ -29,9 +29,9 @@ namespace {
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-EmulationTiming::EmulationTiming(FrameLayout frameLayout, ConsoleTiming consoleTiming) :
-  myFrameLayout(frameLayout),
-  myConsoleTiming(consoleTiming)
+EmulationTiming::EmulationTiming(FrameLayout frameLayout, ConsoleTiming consoleTiming)
+  : myFrameLayout{frameLayout},
+    myConsoleTiming{consoleTiming}
 {
   recalculate();
 }
diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index e965ceaf3..2b0dada20 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -71,7 +71,7 @@ using namespace std::placeholders;
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 EventHandler::EventHandler(OSystem& osystem)
-  : myOSystem(osystem)
+  : myOSystem{osystem}
 {
 }
 
diff --git a/src/emucore/FSNode.cxx b/src/emucore/FSNode.cxx
index 6ff0b6482..c228c916c 100644
--- a/src/emucore/FSNode.cxx
+++ b/src/emucore/FSNode.cxx
@@ -20,7 +20,7 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 FilesystemNode::FilesystemNode(const AbstractFSNodePtr& realNode)
-  : _realNode(realNode)
+  : _realNode{realNode}
 {
 }
 
diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx
index 0866ecf58..670e33f8c 100644
--- a/src/emucore/FrameBuffer.cxx
+++ b/src/emucore/FrameBuffer.cxx
@@ -60,7 +60,7 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 FrameBuffer::FrameBuffer(OSystem& osystem)
-  : myOSystem(osystem)
+  : myOSystem{osystem}
 {
 }
 
diff --git a/src/emucore/KidVid.cxx b/src/emucore/KidVid.cxx
index f9ade13e1..088eab854 100644
--- a/src/emucore/KidVid.cxx
+++ b/src/emucore/KidVid.cxx
@@ -24,7 +24,7 @@
 KidVid::KidVid(Jack jack, const Event& event, const System& system,
                const string& romMd5)
   : Controller(jack, event, system, Controller::Type::KidVid),
-    myEnabled(myJack == Jack::Right)
+    myEnabled{myJack == Jack::Right}
 {
   // Right now, there are only two games that use the KidVid
   if(romMd5 == "ee6665683ebdb539e89ba620981cb0f6")
diff --git a/src/emucore/Lightgun.cxx b/src/emucore/Lightgun.cxx
index 3ae39d8e5..7a7c25a88 100644
--- a/src/emucore/Lightgun.cxx
+++ b/src/emucore/Lightgun.cxx
@@ -29,7 +29,7 @@
 Lightgun::Lightgun(Jack jack, const Event& event, const System& system,
                    const string& romMd5, const FrameBuffer& frameBuffer)
   : Controller(jack, event, system, Controller::Type::Lightgun),
-    myFrameBuffer(frameBuffer)
+    myFrameBuffer{frameBuffer}
 {
   // Right now, there are only three games and a test ROM that use the light gun
   if (romMd5 == "8da51e0c4b6b46f7619425119c7d018e" ||
diff --git a/src/emucore/M6502.cxx b/src/emucore/M6502.cxx
index 295697af2..c3eb93b85 100644
--- a/src/emucore/M6502.cxx
+++ b/src/emucore/M6502.cxx
@@ -47,7 +47,7 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 M6502::M6502(const Settings& settings)
-  : mySettings(settings)
+  : mySettings{settings}
 {
 }
 
diff --git a/src/emucore/M6532.cxx b/src/emucore/M6532.cxx
index eaa43c61f..ee3e38a36 100644
--- a/src/emucore/M6532.cxx
+++ b/src/emucore/M6532.cxx
@@ -27,8 +27,8 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 M6532::M6532(const ConsoleIO& console, const Settings& settings)
-  : myConsole(console),
-    mySettings(settings)
+  : myConsole{console},
+    mySettings{settings}
 {
 }
 
diff --git a/src/emucore/MT24LC256.cxx b/src/emucore/MT24LC256.cxx
index 53004b804..0dd9a7b6c 100644
--- a/src/emucore/MT24LC256.cxx
+++ b/src/emucore/MT24LC256.cxx
@@ -45,9 +45,9 @@
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 MT24LC256::MT24LC256(const FilesystemNode& eepromfile, const System& system,
                      const Controller::onMessageCallback& callback)
-  : mySystem(system),
-    myCallback(callback),
-    myDataFile(eepromfile)
+  : mySystem{system},
+    myCallback{callback},
+    myDataFile{eepromfile}
 {
   // Load the data from an external file (if it exists)
   bool fileValid = false;
diff --git a/src/emucore/Paddles.hxx b/src/emucore/Paddles.hxx
index 3c70cfe39..7d810c27b 100644
--- a/src/emucore/Paddles.hxx
+++ b/src/emucore/Paddles.hxx
@@ -62,7 +62,6 @@ class Paddles : public Controller
     static constexpr int MIN_MOUSE_RANGE = 1;
     static constexpr int MAX_MOUSE_RANGE = 100;
 
-
     /**
       Update the entire digital and analog pin state according to the
       events currently set.
diff --git a/src/emucore/PointingDevice.cxx b/src/emucore/PointingDevice.cxx
index 9f7001ac7..1ff1e68bc 100644
--- a/src/emucore/PointingDevice.cxx
+++ b/src/emucore/PointingDevice.cxx
@@ -29,7 +29,7 @@ PointingDevice::PointingDevice(Jack jack, const Event& event,
                                const System& system, Controller::Type type,
                                float sensitivity)
   : Controller(jack, event, system, type),
-    mySensitivity(sensitivity)
+    mySensitivity{sensitivity}
 {
   // The code in ::read() is set up to always return IOPortA values in
   // the lower 4 bits data value
diff --git a/src/emucore/ProfilingRunner.cxx b/src/emucore/ProfilingRunner.cxx
index 877d35934..810c4bbe5 100644
--- a/src/emucore/ProfilingRunner.cxx
+++ b/src/emucore/ProfilingRunner.cxx
@@ -56,7 +56,7 @@ namespace {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ProfilingRunner::ProfilingRunner(int argc, char* argv[])
-  : profilingRuns(std::max(argc - 2, 0))
+  : profilingRuns{std::max<size_t>(argc - 2, 0)}
 {
   for (int i = 2; i < argc; i++) {
     ProfilingRun& run(profilingRuns[i-2]);
diff --git a/src/emucore/QuadTari.cxx b/src/emucore/QuadTari.cxx
index f3fb00cdf..174304e7c 100644
--- a/src/emucore/QuadTari.cxx
+++ b/src/emucore/QuadTari.cxx
@@ -30,11 +30,12 @@
 #include "QuadTari.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-QuadTari::QuadTari(Jack jack, const OSystem& osystem, const System& system, const Properties& properties)
+QuadTari::QuadTari(Jack jack, const OSystem& osystem, const System& system,
+                   const Properties& properties)
   : Controller(jack, osystem.eventHandler().event(), system,
                Controller::Type::QuadTari),
-    myOSystem(osystem),
-    myProperties(properties)
+    myOSystem{osystem},
+    myProperties{properties}
 {
   Controller::Type firstType = Controller::Type::Joystick,
     secondType = Controller::Type::Joystick;
diff --git a/src/emucore/SaveKey.cxx b/src/emucore/SaveKey.cxx
index dcab2b8b3..11a7a5682 100644
--- a/src/emucore/SaveKey.cxx
+++ b/src/emucore/SaveKey.cxx
@@ -25,7 +25,7 @@ SaveKey::SaveKey(Jack jack, const Event& event, const System& system,
                  const FilesystemNode& eepromfile, const onMessageCallback& callback,
                  Type type)
   : Controller(jack, event, system, type),
-    myEEPROM(make_unique<MT24LC256>(eepromfile, system, callback))
+    myEEPROM{make_unique<MT24LC256>(eepromfile, system, callback)}
 {
   setPin(DigitalPin::One, true);
   setPin(DigitalPin::Two, true);
diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx
index 4063687d9..185b72c5c 100644
--- a/src/emucore/Settings.cxx
+++ b/src/emucore/Settings.cxx
@@ -33,7 +33,7 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Settings::Settings()
-  : myRespository(make_shared<KeyValueRepositoryNoop>())
+  : myRespository{make_shared<KeyValueRepositoryNoop>()}
 {
   // If no version is recorded with the persisted settings, we set it to zero
   setPermanent(SETTINGS_VERSION_KEY, 0);
diff --git a/src/emucore/Switches.cxx b/src/emucore/Switches.cxx
index 2708a2b98..1a9be545a 100644
--- a/src/emucore/Switches.cxx
+++ b/src/emucore/Switches.cxx
@@ -23,7 +23,7 @@
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Switches::Switches(const Event& event, const Properties& properties,
                    const Settings& settings)
-  : myEvent(event)
+  : myEvent{event}
 {
   if(properties.get(PropType::Console_RightDiff) == "B")
   {
diff --git a/src/emucore/System.cxx b/src/emucore/System.cxx
index 28587d0ee..42e8ae437 100644
--- a/src/emucore/System.cxx
+++ b/src/emucore/System.cxx
@@ -29,11 +29,11 @@
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 System::System(Random& random, M6502& m6502, M6532& m6532,
                TIA& mTIA, Cartridge& mCart)
-  : myRandom(random),
-    myM6502(m6502),
-    myM6532(m6532),
-    myTIA(mTIA),
-    myCart(mCart)
+  : myRandom{random},
+    myM6502{m6502},
+    myM6532{m6532},
+    myTIA{mTIA},
+    myCart{mCart}
 {
   // Initialize page access table
   PageAccess access(&myNullDevice, System::PageAccessType::READ);
diff --git a/src/emucore/System.hxx b/src/emucore/System.hxx
index cf483c342..de1bba21c 100644
--- a/src/emucore/System.hxx
+++ b/src/emucore/System.hxx
@@ -293,7 +293,7 @@ class System : public Serializable
 
       // Constructors
       PageAccess() = default;
-      PageAccess(Device* dev, PageAccessType access) : device(dev), type(access) { }
+      PageAccess(Device* dev, PageAccessType access) : device{dev}, type{access} { }
     };
 
     /**
diff --git a/src/emucore/TIASurface.cxx b/src/emucore/TIASurface.cxx
index ec9be3ab9..f824ae26e 100644
--- a/src/emucore/TIASurface.cxx
+++ b/src/emucore/TIASurface.cxx
@@ -46,8 +46,8 @@ namespace {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 TIASurface::TIASurface(OSystem& system)
-  : myOSystem(system),
-    myFB(system.frameBuffer())
+  : myOSystem{system},
+    myFB{system.frameBuffer()}
 {
   // Load NTSC filter settings
   myNTSCFilter.loadConfig(myOSystem.settings());
diff --git a/src/emucore/Thumbulator.cxx b/src/emucore/Thumbulator.cxx
index bfb835fd5..7ae4ea4d0 100644
--- a/src/emucore/Thumbulator.cxx
+++ b/src/emucore/Thumbulator.cxx
@@ -57,15 +57,15 @@ Thumbulator::Thumbulator(const uInt16* rom_ptr, uInt16* ram_ptr, uInt32 rom_size
                          const uInt32 c_base, const uInt32 c_start, const uInt32 c_stack,
                          bool traponfatal, Thumbulator::ConfigureFor configurefor,
                          Cartridge* cartridge)
-  : rom(rom_ptr),
-    romSize(rom_size),
-    cBase(c_base),
-    cStart(c_start),
-    cStack(c_stack),
-    decodedRom(make_unique<Op[]>(romSize / 2)),  // NOLINT
-    ram(ram_ptr),
-    configuration(configurefor),
-    myCartridge(cartridge)
+  : rom{rom_ptr},
+    romSize{rom_size},
+    cBase{c_base},
+    cStart{c_start},
+    cStack{c_stack},
+    decodedRom{make_unique<Op[]>(romSize / 2)},  // NOLINT
+    ram{ram_ptr},
+    configuration{configurefor},
+    myCartridge{cartridge}
 {
   for(uInt32 i = 0; i < romSize / 2; ++i)
     decodedRom[i] = decodeInstructionWord(CONV_RAMROM(rom[i]));
diff --git a/src/emucore/tia/Ball.cxx b/src/emucore/tia/Ball.cxx
index 0d2b6be84..4e43cb61c 100644
--- a/src/emucore/tia/Ball.cxx
+++ b/src/emucore/tia/Ball.cxx
@@ -20,7 +20,7 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Ball::Ball(uInt32 collisionMask)
-  : myCollisionMaskDisabled(collisionMask)
+  : myCollisionMaskDisabled{collisionMask}
 {
 }
 
diff --git a/src/emucore/tia/Missile.cxx b/src/emucore/tia/Missile.cxx
index 2e2e12c31..bde1555db 100644
--- a/src/emucore/tia/Missile.cxx
+++ b/src/emucore/tia/Missile.cxx
@@ -21,7 +21,7 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Missile::Missile(uInt32 collisionMask)
-  : myCollisionMaskDisabled(collisionMask)
+  : myCollisionMaskDisabled{collisionMask}
 {
 }
 
diff --git a/src/emucore/tia/Player.cxx b/src/emucore/tia/Player.cxx
index 246c0ff7a..137ca385c 100644
--- a/src/emucore/tia/Player.cxx
+++ b/src/emucore/tia/Player.cxx
@@ -21,7 +21,7 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Player::Player(uInt32 collisionMask)
-  : myCollisionMaskDisabled(collisionMask)
+  : myCollisionMaskDisabled{collisionMask}
 {
 }
 
diff --git a/src/emucore/tia/Playfield.cxx b/src/emucore/tia/Playfield.cxx
index 0c1456c88..e6b420a5c 100644
--- a/src/emucore/tia/Playfield.cxx
+++ b/src/emucore/tia/Playfield.cxx
@@ -20,7 +20,7 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Playfield::Playfield(uInt32 collisionMask)
-  : myCollisionMaskDisabled(collisionMask)
+  : myCollisionMaskDisabled{collisionMask}
 {
 }
 
diff --git a/src/emucore/tia/TIA.cxx b/src/emucore/tia/TIA.cxx
index 3ae0713c3..3b157f5ed 100644
--- a/src/emucore/tia/TIA.cxx
+++ b/src/emucore/tia/TIA.cxx
@@ -66,15 +66,15 @@ static constexpr uInt8 resxLateHblankThreshold = TIAConstants::H_CYCLES - 3;
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 TIA::TIA(ConsoleIO& console, const ConsoleTimingProvider& timingProvider,
          Settings& settings)
-  : myConsole(console),
-    myTimingProvider(timingProvider),
-    mySettings(settings),
-    myPlayfield(~CollisionMask::playfield & 0x7FFF),
-    myMissile0(~CollisionMask::missile0 & 0x7FFF),
-    myMissile1(~CollisionMask::missile1 & 0x7FFF),
-    myPlayer0(~CollisionMask::player0 & 0x7FFF),
-    myPlayer1(~CollisionMask::player1 & 0x7FFF),
-    myBall(~CollisionMask::ball & 0x7FFF)
+  : myConsole{console},
+    myTimingProvider{timingProvider},
+    mySettings{settings},
+    myPlayfield{~CollisionMask::playfield & 0x7FFF},
+    myMissile0{~CollisionMask::missile0 & 0x7FFF},
+    myMissile1{~CollisionMask::missile1 & 0x7FFF},
+    myPlayer0{~CollisionMask::player0 & 0x7FFF},
+    myPlayer1{~CollisionMask::player1 & 0x7FFF},
+    myBall{~CollisionMask::ball & 0x7FFF}
 {
   myBackground.setTIA(this);
   myPlayfield.setTIA(this);
diff --git a/src/gui/LauncherDialog.cxx b/src/gui/LauncherDialog.cxx
index e05ca3efc..cec05172d 100644
--- a/src/gui/LauncherDialog.cxx
+++ b/src/gui/LauncherDialog.cxx
@@ -435,6 +435,7 @@ void LauncherDialog::updateUI()
   loadRomInfo();
 }
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 size_t LauncherDialog::matchWithJoker(const string& str, const string& pattern)
 {
   if(str.length() >= pattern.length())
@@ -460,6 +461,7 @@ size_t LauncherDialog::matchWithJoker(const string& str, const string& pattern)
   return string::npos;
 }
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 bool LauncherDialog::matchWithWildcards(const string& str, const string& pattern)
 {
   string pat = pattern;