diff --git a/hal/lib/Athena/PDP.cpp b/hal/lib/Athena/PDP.cpp
index fff7a1f33f..d82639c387 100644
--- a/hal/lib/Athena/PDP.cpp
+++ b/hal/lib/Athena/PDP.cpp
@@ -4,7 +4,7 @@
 
 static const int NUM_MODULE_NUMBERS = 63;
 
-PDP *pdp[NUM_MODULE_NUMBERS] = { NULL };
+static PDP *pdp[NUM_MODULE_NUMBERS] = { NULL };
 
 void initializePDP(int module) {
 	if(!pdp[module]) {
@@ -14,49 +14,49 @@ void initializePDP(int module) {
 
 double getPDPTemperature(int32_t *status, uint8_t module) {
 	double temperature;
-	
+
 	*status = pdp[module]->GetTemperature(temperature);
-	
+
 	return temperature;
 }
 
 double getPDPVoltage(int32_t *status, uint8_t module) {
 	double voltage;
-	
+
 	*status = pdp[module]->GetVoltage(voltage);
-	
+
 	return voltage;
 }
 
 double getPDPChannelCurrent(uint8_t channel, int32_t *status, uint8_t module) {
 	double current;
-	
+
 	*status = pdp[module]->GetChannelCurrent(channel, current);
-	
+
 	return current;
 }
 
 double getPDPTotalCurrent(int32_t *status, uint8_t module) {
 	double current;
-	
+
 	*status = pdp[module]->GetTotalCurrent(current);
-	
+
 	return current;
 }
 
 double getPDPTotalPower(int32_t *status, uint8_t module) {
 	double power;
-	
+
 	*status = pdp[module]->GetTotalPower(power);
-	
+
 	return power;
 }
 
 double getPDPTotalEnergy(int32_t *status, uint8_t module) {
 	double energy;
-	
+
 	*status = pdp[module]->GetTotalEnergy(energy);
-	
+
 	return energy;
 }
 
diff --git a/wpilibc/wpilibC++Devices/src/PowerDistributionPanel.cpp b/wpilibc/wpilibC++Devices/src/PowerDistributionPanel.cpp
index ec48158689..e2daa83534 100644
--- a/wpilibc/wpilibC++Devices/src/PowerDistributionPanel.cpp
+++ b/wpilibc/wpilibC++Devices/src/PowerDistributionPanel.cpp
@@ -10,14 +10,13 @@
 #include "HAL/PDP.hpp"
 #include "LiveWindow/LiveWindow.h"
 
-PowerDistributionPanel::PowerDistributionPanel() { PowerDistributionPanel(0); }
+PowerDistributionPanel::PowerDistributionPanel() : PowerDistributionPanel(0) {}
 
 /**
  * Initialize the PDP.
  */
-PowerDistributionPanel::PowerDistributionPanel(uint8_t module) {
-  m_table = NULL;
-  m_module = module;
+PowerDistributionPanel::PowerDistributionPanel(uint8_t module)
+    : m_table(nullptr), m_module(module) {
   initializePDP(m_module);
 }