diff --git a/Grid/qcd/action/gauge/PlaqPlusRectangleAction.h b/Grid/qcd/action/gauge/PlaqPlusRectangleAction.h
index 55b98986..a3b49973 100644
--- a/Grid/qcd/action/gauge/PlaqPlusRectangleAction.h
+++ b/Grid/qcd/action/gauge/PlaqPlusRectangleAction.h
@@ -72,29 +72,29 @@ public:
   };
 
   virtual void deriv(const GaugeField &U, GaugeField &dSdU) {
-    // extend Ta to include Lorentz indexes
-    RealD factor_p = c_plaq / RealD(Nc) * 0.5;
-    RealD factor_r = c_rect / RealD(Nc) * 0.5;
+    //extend Ta to include Lorentz indexes
+    RealD factor_p = c_plaq/RealD(Nc)*0.5;
+    RealD factor_r = c_rect/RealD(Nc)*0.5;
 
-    GridBase *grid = U.Grid();
+    GridBase *grid = Umu.Grid();
 
-    std::vector<GaugeLinkField> Umu(Nd, grid);
-    for (int mu = 0; mu < Nd; mu++) {
-      Umu[mu] = PeekIndex<LorentzIndex>(U, mu);
+    std::vector<GaugeLinkField> U (Nd,grid);
+    for(int mu=0;mu<Nd;mu++){
+      U[mu] = PeekIndex<LorentzIndex>(Umu,mu);
     }
-    std::vector<GaugeLinkField> RectStaple(Nd, grid), Staple(Nd, grid);
-    WilsonLoops<Gimpl>::StapleAndRectStapleAll(Staple, RectStaple, Umu,
-                                               workspace);
+    std::vector<GaugeLinkField> RectStaple(Nd,grid), Staple(Nd,grid);
+    WilsonLoops<Gimpl>::StapleAndRectStapleAll(Staple, RectStaple, U, workspace);
 
     GaugeLinkField dSdU_mu(grid);
     GaugeLinkField staple(grid);
 
-    for (int mu = 0; mu < Nd; mu++) {
-      dSdU_mu = Ta(Umu[mu] * Staple[mu]) * factor_p;
-      dSdU_mu = dSdU_mu + Ta(Umu[mu] * RectStaple[mu]) * factor_r;
+    for (int mu=0; mu < Nd; mu++){
+      dSdU_mu = Ta(U[mu]*Staple[mu])*factor_p;
+      dSdU_mu = dSdU_mu + Ta(U[mu]*RectStaple[mu])*factor_r;
 
       PokeIndex<LorentzIndex>(dSdU, dSdU_mu, mu);
     }
+
   };
 
 };
diff --git a/Grid/qcd/utils/WilsonLoops.h b/Grid/qcd/utils/WilsonLoops.h
index cd281033..b4ab35d7 100644
--- a/Grid/qcd/utils/WilsonLoops.h
+++ b/Grid/qcd/utils/WilsonLoops.h
@@ -318,8 +318,11 @@ public:
         //
 
         staple += Gimpl::ShiftStaple(
-          Gimpl::CovShiftForward(Umu[nu], nu,
-            Gimpl::CovShiftBackward(Umu[mu], mu, Gimpl::CovShiftIdentityBackward(Umu[nu], nu))), mu);
+				     Gimpl::CovShiftForward(
+							    U[nu], nu,
+							    Gimpl::CovShiftBackward(
+										    U[mu], mu, Gimpl::CovShiftIdentityBackward(U[nu], nu))),
+				     mu);
 
         //  __
         // |
@@ -328,8 +331,8 @@ public:
         //
 
         staple += Gimpl::ShiftStaple(
-          Gimpl::CovShiftBackward(Umu[nu], nu,
-            Gimpl::CovShiftBackward(Umu[mu], mu, Umu[nu])), mu);
+				     Gimpl::CovShiftBackward(U[nu], nu,
+							     Gimpl::CovShiftBackward(U[mu], mu, U[nu])), mu);
       }
     }
   }