diff --git a/wxdata/source/scwx/wsr88d/rpg/digital_precipitation_data_array_packet.cpp b/wxdata/source/scwx/wsr88d/rpg/digital_precipitation_data_array_packet.cpp
index 1d0e477c..b5e0c595 100644
--- a/wxdata/source/scwx/wsr88d/rpg/digital_precipitation_data_array_packet.cpp
+++ b/wxdata/source/scwx/wsr88d/rpg/digital_precipitation_data_array_packet.cpp
@@ -15,18 +15,18 @@ namespace rpg
 static const std::string logPrefix_ =
    "[scwx::wsr88d::rpg::digital_precipitation_data_array_packet] ";
 
-struct Row
-{
-   uint16_t             numberOfBytes_;
-   std::vector<uint8_t> run_;
-   std::vector<uint8_t> level_;
-
-   Row() : numberOfBytes_ {0}, run_ {}, level_ {} {}
-};
-
 class DigitalPrecipitationDataArrayPacketImpl
 {
 public:
+   struct Row
+   {
+      uint16_t             numberOfBytes_;
+      std::vector<uint8_t> run_;
+      std::vector<uint8_t> level_;
+
+      Row() : numberOfBytes_ {0}, run_ {}, level_ {} {}
+   };
+
    explicit DigitalPrecipitationDataArrayPacketImpl() :
        packetCode_ {0},
        numberOfLfmBoxesInRow_ {0},
@@ -122,7 +122,7 @@ bool DigitalPrecipitationDataArrayPacket::Parse(std::istream& is)
       {
          size_t rowBytesRead = 0;
 
-         Row& row = p->row_[r];
+         auto& row = p->row_[r];
 
          is.read(reinterpret_cast<char*>(&row.numberOfBytes_), 2);
          bytesRead += 2;
diff --git a/wxdata/source/scwx/wsr88d/rpg/radial_data_packet.cpp b/wxdata/source/scwx/wsr88d/rpg/radial_data_packet.cpp
index f6669594..3c36588d 100644
--- a/wxdata/source/scwx/wsr88d/rpg/radial_data_packet.cpp
+++ b/wxdata/source/scwx/wsr88d/rpg/radial_data_packet.cpp
@@ -15,30 +15,30 @@ namespace rpg
 static const std::string logPrefix_ =
    "[scwx::wsr88d::rpg::radial_data_packet] ";
 
-struct Radial
-{
-   uint16_t             numberOfRleHalfwords_;
-   uint16_t             startAngle_;
-   uint16_t             angleDelta_;
-   std::vector<uint8_t> data_;
-
-   Radial() :
-       numberOfRleHalfwords_ {0}, startAngle_ {0}, angleDelta_ {0}, data_ {}
-   {
-   }
-};
-
 class RadialDataPacketImpl
 {
 public:
+   struct Radial
+   {
+      uint16_t             numberOfRleHalfwords_;
+      uint16_t             startAngle_;
+      uint16_t             angleDelta_;
+      std::vector<uint8_t> data_;
+
+      Radial() :
+          numberOfRleHalfwords_ {0}, startAngle_ {0}, angleDelta_ {0}, data_ {}
+      {
+      }
+   };
+
    explicit RadialDataPacketImpl() :
-       packetCode_ {},
-       indexOfFirstRangeBin_ {},
-       numberOfRangeBins_ {},
-       iCenterOfSweep_ {},
-       jCenterOfSweep_ {},
-       scaleFactor_ {},
-       dataSize_ {} {};
+       packetCode_ {0},
+       indexOfFirstRangeBin_ {0},
+       numberOfRangeBins_ {0},
+       iCenterOfSweep_ {0},
+       jCenterOfSweep_ {0},
+       scaleFactor_ {0},
+       dataSize_ {0} {};
    ~RadialDataPacketImpl() = default;
 
    uint16_t packetCode_;
@@ -162,7 +162,7 @@ bool RadialDataPacket::Parse(std::istream& is)
 
       for (uint16_t r = 0; r < p->numberOfRadials_; r++)
       {
-         Radial& radial = p->radial_[r];
+         auto& radial = p->radial_[r];
 
          is.read(reinterpret_cast<char*>(&radial.numberOfRleHalfwords_), 2);
          is.read(reinterpret_cast<char*>(&radial.startAngle_), 2);
diff --git a/wxdata/source/scwx/wsr88d/rpg/raster_data_packet.cpp b/wxdata/source/scwx/wsr88d/rpg/raster_data_packet.cpp
index ecb271d3..3ac1a464 100644
--- a/wxdata/source/scwx/wsr88d/rpg/raster_data_packet.cpp
+++ b/wxdata/source/scwx/wsr88d/rpg/raster_data_packet.cpp
@@ -15,30 +15,30 @@ namespace rpg
 static const std::string logPrefix_ =
    "[scwx::wsr88d::rpg::raster_data_packet] ";
 
-struct Row
-{
-   uint16_t             numberOfBytes_;
-   std::vector<uint8_t> data_;
-
-   Row() : numberOfBytes_ {0}, data_ {} {}
-};
-
 class RasterDataPacketImpl
 {
 public:
+   struct Row
+   {
+      uint16_t             numberOfBytes_;
+      std::vector<uint8_t> data_;
+
+      Row() : numberOfBytes_ {0}, data_ {} {}
+   };
+
    explicit RasterDataPacketImpl() :
-       packetCode_ {},
-       opFlag_ {},
-       iCoordinateStart_ {},
-       jCoordinateStart_ {},
-       xScaleInt_ {},
-       xScaleFractional_ {},
-       yScaleInt_ {},
-       yScaleFractional_ {},
-       numberOfRows_ {},
-       packagingDescriptor_ {},
+       packetCode_ {0},
+       opFlag_ {0},
+       iCoordinateStart_ {0},
+       jCoordinateStart_ {0},
+       xScaleInt_ {0},
+       xScaleFractional_ {0},
+       yScaleInt_ {0},
+       yScaleFractional_ {0},
+       numberOfRows_ {0},
+       packagingDescriptor_ {0},
        row_ {},
-       dataSize_ {} {};
+       dataSize_ {0} {};
    ~RasterDataPacketImpl() = default;
 
    uint16_t                packetCode_;
@@ -52,7 +52,7 @@ public:
    uint16_t                numberOfRows_;
    uint16_t                packagingDescriptor_;
 
-   // Repeat for each radial
+   // Repeat for each row
    std::vector<Row> row_;
 
    size_t dataSize_;
@@ -181,7 +181,7 @@ bool RasterDataPacket::Parse(std::istream& is)
       {
          size_t rowBytesRead = 0;
 
-         Row& row = p->row_[r];
+         auto& row = p->row_[r];
 
          is.read(reinterpret_cast<char*>(&row.numberOfBytes_), 2);
          bytesRead += 2;