diff --git a/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PartialPVThermal.mo b/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PartialPVThermal.mo
index 3ef247986b..6d95875aca 100644
--- a/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PartialPVThermal.mo
+++ b/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PartialPVThermal.mo
@@ -1,7 +1,6 @@
 within IBPSA.Electrical.BaseClasses.PV.BaseClasses;
 partial model PartialPVThermal
- "Partial model for computing the cell temperature of a PV moduleConnector
-  for PV record data"
+ "Partial model for computing the cell temperature of a PV moduleConnector for PV record data"
   replaceable parameter IBPSA.Electrical.Data.PV.Generic data constrainedby
     IBPSA.Electrical.Data.PV.Generic
     "PV Panel data definition"
diff --git a/IBPSA/Electrical/BaseClasses/PV/BaseClasses/lambertWSimple.mo b/IBPSA/Electrical/BaseClasses/PV/BaseClasses/lambertWSimple.mo
index bd6db83023..d67126085e 100644
--- a/IBPSA/Electrical/BaseClasses/PV/BaseClasses/lambertWSimple.mo
+++ b/IBPSA/Electrical/BaseClasses/PV/BaseClasses/lambertWSimple.mo
@@ -1,7 +1,6 @@
 within IBPSA.Electrical.BaseClasses.PV.BaseClasses;
 function lambertWSimple
-  "Simple approximation for Lambert W function for x >= 2, should only
-be used for large input values as error decreases for increasing input values"
+  "Simple approximation for Lambert W function for x >= 2, should only be used for large input values as error decreases for increasing input values"
 
    input Real x(min=2);
    output Real W;
diff --git a/IBPSA/Electrical/BaseClasses/PV/PVElectricalSingleDiodeMPP.mo b/IBPSA/Electrical/BaseClasses/PV/PVElectricalSingleDiodeMPP.mo
index 8f386e5b0a..7ba4d4c1c8 100644
--- a/IBPSA/Electrical/BaseClasses/PV/PVElectricalSingleDiodeMPP.mo
+++ b/IBPSA/Electrical/BaseClasses/PV/PVElectricalSingleDiodeMPP.mo
@@ -51,7 +51,7 @@ model PVElectricalSingleDiodeMPP "Analytical 5-p model for PV I-V
 
 equation
 
-  // Analytical parameter extraction equations under standard conditions (Batzelis et al, 2016)
+  // Analytical parameter extraction equations under standard conditions (Batzelis et al., 2016)
 
   a_0 = V_oc0*(1-TCel0*beta_Voc)/(50.1-TCel0*alpha_Isc);
 
@@ -65,7 +65,7 @@ equation
 
   I_s0 = I_ph0*exp(-1/(a_0/V_oc0));
 
-  // Parameter extrapolation equations to operating conditions (DeSoto et al, 2006)
+  // Parameter extrapolation equations to operating conditions (DeSoto et al., 2006)
 
   a/a_0 = TCel/TCel0;
 
@@ -79,7 +79,7 @@ equation
 
   R_sh/R_sh0 = if noEvent(absRadRat > Modelica.Constants.eps) then 1/absRadRat else 0;
 
-  //Simplified Power correlations at MPP using lambert W function (Batzelis et al, 2016)
+  //Simplified Power correlations at MPP using lambert W function (Batzelis et al., 2016)
 
   I_mp = if noEvent(absRadRat <= Modelica.Constants.eps or w<=Modelica.Constants.eps) then 0
          else I_ph*(1-1/w)-a*(w-1)/R_sh;
diff --git a/IBPSA/Electrical/BaseClasses/PV/PVOpticalAbsRat.mo b/IBPSA/Electrical/BaseClasses/PV/PVOpticalAbsRat.mo
index 90d1e4220d..25d525e233 100644
--- a/IBPSA/Electrical/BaseClasses/PV/PVOpticalAbsRat.mo
+++ b/IBPSA/Electrical/BaseClasses/PV/PVOpticalAbsRat.mo
@@ -8,7 +8,7 @@ model PVOpticalAbsRat
    "Site altitude in Meters, default= 1"
    annotation(Dialog(group="Location"));
 
- parameter Real groRef(unit="1")       "Ground reflectance"
+ parameter Real groRef(unit="1") "Ground reflectance"
    annotation ();
 
   constant Modelica.Units.SI.Irradiance HGloHor0=1000
@@ -150,7 +150,7 @@ R_b = if noEvent((zen >= Modelica.Constants.pi/2*0.999) or (cos(incAng)
 HGloHor = HDirHor + HDifHor;
 
 
-//Computes the absorption irradiation ratio for operating conditions following De Soto et al
+//Computes the absorption irradiation ratio for operating conditions following De Soto et al.
 absRadRat = if noEvent(HGloHor <=0.1) then 0
   else
   airMassModifier.airMasMod*(HDirHor/HGloHor0*R_b*incAngMod
diff --git a/IBPSA/Electrical/DC/Sources/PVSingleDiode.mo b/IBPSA/Electrical/DC/Sources/PVSingleDiode.mo
index e90305e073..0bb7970e9f 100644
--- a/IBPSA/Electrical/DC/Sources/PVSingleDiode.mo
+++ b/IBPSA/Electrical/DC/Sources/PVSingleDiode.mo
@@ -28,8 +28,7 @@ equation
                         color={0,0,127}));
   connect(PVElectrical.P, PDC) annotation (Line(points={{-3.4,-46.25},{20,-46.25},
           {20,-40},{60,-40},{60,0},{110,0}}, color={0,0,127}));
-  connect(PVOptical.absRadRat, PVElectrical.absRadRat)
-    annotation (Line(points={{-4.54545,30},{20,30},{20,-34},{-64,-34},{-64,-52.25},
+  connect(PVOptical.absRadRat, PVElectrical.absRadRat) annotation (Line(points={{-4.54545,30},{20,30},{20,-34},{-64,-34},{-64,-52.25},
           {-17.2,-52.25}},color={0,0,127}));
   connect(HGloTil, PVElectrical.HGloTil) annotation (Line(points={{-120,-60},{-100,
           -60},{-100,-54},{-68,-54},{-68,-55.25},{-17.2,-55.25}},      color={0,
@@ -46,7 +45,6 @@ equation
           {-22,64},{-22,31.8},{-17.0909,31.8}},                   color={0,0,127}));
   connect(HDifHor, PVOptical.HDifHor) annotation (Line(points={{-120,-90},{-120,
           70},{-72,70},{-72,27},{-17.0909,27}},                     color={0,0,127}));
-
   connect(HGloHor, PVOptical.HGloHor) annotation (Line(points={{-120,-30},{-20,-30},
           {-20,29.4},{-17.0909,29.4}},          color={0,0,127}));
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(