diff --git a/opm/output/eclipse/VectorItems/group.hpp b/opm/output/eclipse/VectorItems/group.hpp
index 793db5452..798342016 100644
--- a/opm/output/eclipse/VectorItems/group.hpp
+++ b/opm/output/eclipse/VectorItems/group.hpp
@@ -24,10 +24,10 @@
 
 namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems {
 
+    namespace SGroup {
 
-        namespace SGroup {
         enum prod_index : std::vector<float>::size_type {
-            GuideRate     =  2,
+            GuideRate     =  2, // Group's guide rate value
             OilRateLimit  =  6, // Group's oil production target/limit
             WatRateLimit  =  7, // Group's water production target/limit
             GasRateLimit  =  8, // Group's gas production target/limit
@@ -41,7 +41,7 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
             oilResRateLimit         =  11, // Group's oil reservoir volume injection rate target/limit
             oilReinjectionLimit     =  12, // Group's oil reinjection fraction target/limit
             oilVoidageLimit         =  13, // Group's oil voidage injection fraction target/limit
-            waterSurfRateLimit      =  15, //i Group's water surface volume injection rate target/limit
+            waterSurfRateLimit      =  15, // Group's water surface volume injection rate target/limit
             waterResRateLimit       =  16, // Group's water reservoir volume injection rate target/limit
             waterReinjectionLimit   =  17, // Group's water reinjection fraction target/limit
             waterVoidageLimit       =  18, // Group's water voidage injection fraction target/limit
@@ -49,7 +49,6 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
             gasResRateLimit         =  21, // Group's gas reservoir volume injection rate target/limit
             gasReinjectionLimit     =  22, // Group's gas reinjection fraction target/limit
             gasVoidageLimit         =  23, // Group's gas voidage injection fraction target/limit
-
         };
     } // SGroup
 
diff --git a/src/opm/output/eclipse/AggregateGroupData.cpp b/src/opm/output/eclipse/AggregateGroupData.cpp
index a237fec38..34989597e 100644
--- a/src/opm/output/eclipse/AggregateGroupData.cpp
+++ b/src/opm/output/eclipse/AggregateGroupData.cpp
@@ -767,12 +767,12 @@ template <class SGrpArray>
 void staticContrib(const Opm::Group&        group,
                    const Opm::GasLiftOpt&   glo,
                    const Opm::SummaryState& sumState,
-                   const Opm::UnitSystem& units,
+                   const Opm::UnitSystem&   units,
                    SGrpArray&               sGrp)
 {
     using Isp = ::Opm::RestartIO::Helpers::VectorItems::SGroup::prod_index;
     using Isi = ::Opm::RestartIO::Helpers::VectorItems::SGroup::inj_index;
-    using M = ::Opm::UnitSystem::measure;
+    using M   = ::Opm::UnitSystem::measure;
 
     const auto dflt   = -1.0e+20f;
     const auto dflt_2 = -2.0e+20f;
@@ -782,14 +782,14 @@ void staticContrib(const Opm::Group&        group,
 
     const auto init = std::vector<float> { // 112 Items (0..111)
         // 0     1      2      3      4
-        infty, infty, dflt , infty,  zero ,     //   0..  4  ( 0)
+        infty, infty, dflt , infty , zero ,     //   0..  4  ( 0)
         zero , infty, infty, infty , infty,     //   5..  9  ( 1)
         infty, infty, infty, infty , dflt ,     //  10.. 14  ( 2)
         infty, infty, infty, infty , dflt ,     //  15.. 19  ( 3)
         infty, infty, infty, infty , dflt ,     //  20.. 24  ( 4)
         zero , zero , zero , dflt_2, zero ,     //  24.. 29  ( 5)
         zero , zero , zero , zero  , zero ,     //  30.. 34  ( 6)
-        infty ,zero , zero , zero  , infty,     //  35.. 39  ( 7)
+        infty, zero , zero , zero  , infty,     //  35.. 39  ( 7)
         zero , zero , zero , zero  , zero ,     //  40.. 44  ( 8)
         zero , zero , zero , zero  , zero ,     //  45.. 49  ( 9)
         zero , infty, infty, infty , infty,     //  50.. 54  (10)