diff --git a/include/board_design_settings.h b/include/board_design_settings.h
index deded1ac12..b97b584d4b 100644
--- a/include/board_design_settings.h
+++ b/include/board_design_settings.h
@@ -107,10 +107,10 @@
 #define MAXIMUM_LINE_WIDTH_MM         100.0   // max line width entered in a dialog
 
 // Default pad properties
-#define DEFAULT_PAD_WIDTH_MM 2.54         // master pad width
-#define DEFAULT_PAD_HEIGTH_MM 1.27        // master pad height
-#define DEFAULT_PAD_DRILL_DIAMETER_MM 0.8 // master pad drill diameter for PTH
-#define DEFAULT_PAD_RR_RADIUS_RATIO 0.15  // master pad corner radius ratio
+#define DEFAULT_PAD_WIDTH_MM          2.54
+#define DEFAULT_PAD_HEIGTH_MM         1.27
+#define DEFAULT_PAD_DRILL_DIAMETER_MM 0.8
+#define DEFAULT_PAD_RR_RADIUS_RATIO   0.15
 
 /**
  * Container to handle a stock of specific vias each with unique diameter and drill sizes
diff --git a/pcbnew/pad.cpp b/pcbnew/pad.cpp
index d839aca822..ce4d2fe852 100644
--- a/pcbnew/pad.cpp
+++ b/pcbnew/pad.cpp
@@ -74,25 +74,23 @@ using KIGFX::PCB_RENDER_SETTINGS;
 
 
 PAD::PAD( FOOTPRINT* parent ) :
-    BOARD_CONNECTED_ITEM( parent, PCB_PAD_T ),
-    m_padStack( this )
+        BOARD_CONNECTED_ITEM( parent, PCB_PAD_T ),
+        m_padStack( this )
 {
     VECTOR2I& drill = m_padStack.Drill().size;
-    m_padStack.SetSize( { EDA_UNIT_UTILS::Mils2IU( pcbIUScale, 60 ),
-                          EDA_UNIT_UTILS::Mils2IU( pcbIUScale, 60 ) },
+    m_padStack.SetSize( { EDA_UNIT_UTILS::Mils2IU( pcbIUScale, 60 ), EDA_UNIT_UTILS::Mils2IU( pcbIUScale, 60 ) },
                         PADSTACK::ALL_LAYERS );
     drill.x = drill.y = EDA_UNIT_UTILS::Mils2IU( pcbIUScale, 30 );       // Default drill size 30 mils.
-    m_lengthPadToDie      = 0;
+    m_lengthPadToDie = 0;
     m_delayPadToDie = 0;
 
     if( m_parent && m_parent->Type() == PCB_FOOTPRINT_T )
         m_pos = GetParent()->GetPosition();
 
     SetShape( F_Cu, PAD_SHAPE::CIRCLE );          // Default pad shape is PAD_CIRCLE.
-    SetAnchorPadShape( F_Cu, PAD_SHAPE::CIRCLE ); // Default shape for custom shaped pads
-                                                  // is PAD_CIRCLE.
+    SetAnchorPadShape( F_Cu, PAD_SHAPE::CIRCLE ); // Default anchor shape for custom shaped pads is PAD_CIRCLE.
     SetDrillShape( PAD_DRILL_SHAPE::CIRCLE );     // Default pad drill shape is a circle.
-    m_attribute           = PAD_ATTRIB::PTH;      // Default pad type is plated through hole
+    m_attribute = PAD_ATTRIB::PTH;                // Default pad type is plated through hole
     SetProperty( PAD_PROP::NONE );                // no special fabrication property
 
     // Parameters for round rect only:
@@ -118,8 +116,8 @@ PAD::PAD( FOOTPRINT* parent ) :
 
 
 PAD::PAD( const PAD& aOther ) :
-    BOARD_CONNECTED_ITEM( aOther.GetParent(), PCB_PAD_T ),
-    m_padStack( this )
+        BOARD_CONNECTED_ITEM( aOther.GetParent(), PCB_PAD_T ),
+        m_padStack( this )
 {
     PAD::operator=( aOther );
 
diff --git a/pcbnew/tools/pad_tool.cpp b/pcbnew/tools/pad_tool.cpp
index 8af5c61d08..dd865de88e 100644
--- a/pcbnew/tools/pad_tool.cpp
+++ b/pcbnew/tools/pad_tool.cpp
@@ -563,10 +563,8 @@ int PAD_TOOL::EnumeratePads( const TOOL_EVENT& aEvent )
 
 int PAD_TOOL::PlacePad( const TOOL_EVENT& aEvent )
 {
-    // When creating a new pad (in FP editor) we can use a new pad number
-    // or the last entered pad number
-    // neednewPadNumber = true to create a new pad number, false to use the last
-    // entered pad number
+    // When creating a new pad (in FP editor) we can use a new pad number or the last entered pad number
+    // neednewPadNumber = true to create a new pad number, false to use the last entered pad number
     static bool neednewPadNumber;
 
     if( !m_isFootprintEditor )