diff --git a/extras/Hadrons/Modules/MAction/DWF.cc b/extras/Hadrons/Modules/MAction/DWF.cc
index 626ac69bd..36527b58b 100644
--- a/extras/Hadrons/Modules/MAction/DWF.cc
+++ b/extras/Hadrons/Modules/MAction/DWF.cc
@@ -32,7 +32,7 @@ using namespace Hadrons;
 using namespace MAction;
 
 /******************************************************************************
-*                          DWF implementation                                *
+*                           DWF implementation                                *
 ******************************************************************************/
 // constructor /////////////////////////////////////////////////////////////////
 DWF::DWF(const std::string name)
diff --git a/extras/Hadrons/Modules/MAction/Wilson.cc b/extras/Hadrons/Modules/MAction/Wilson.cc
index a07669e2d..3188a6362 100644
--- a/extras/Hadrons/Modules/MAction/Wilson.cc
+++ b/extras/Hadrons/Modules/MAction/Wilson.cc
@@ -32,7 +32,7 @@ using namespace Hadrons;
 using namespace MAction;
 
 /******************************************************************************
-*                         Wilson implementation                              *
+*                          Wilson implementation                              *
 ******************************************************************************/
 // constructor /////////////////////////////////////////////////////////////////
 Wilson::Wilson(const std::string name)
diff --git a/extras/Hadrons/Modules/MContraction/Meson.cc b/extras/Hadrons/Modules/MContraction/Meson.cc
index 1707f00d3..fbdfceb12 100644
--- a/extras/Hadrons/Modules/MContraction/Meson.cc
+++ b/extras/Hadrons/Modules/MContraction/Meson.cc
@@ -33,7 +33,7 @@ using namespace Hadrons;
 using namespace MContraction;
 
 /******************************************************************************
- *                          Meson implementation                             *
+ *                           Meson implementation                             *
  ******************************************************************************/
 // constructor /////////////////////////////////////////////////////////////////
 Meson::Meson(const std::string name)
@@ -63,13 +63,12 @@ void Meson::execute(void)
                  << std::endl;
     
     XmlWriter             writer(par().output);
-    PropagatorField     &q1 = *env().getObject<PropagatorField>(par().q1);
-    PropagatorField     &q2 = *env().getObject<PropagatorField>(par().q2);
+    PropagatorField       &q1 = *env().getObject<PropagatorField>(par().q1);
+    PropagatorField       &q2 = *env().getObject<PropagatorField>(par().q2);
     LatticeComplex        c(env().getGrid());
     SpinMatrix            g[Ns*Ns], g5;
     std::vector<TComplex> buf;
     Result                result;
-    unsigned int          nt = env().getGrid()->GlobalDimensions()[Tp];
     
     g5 = makeGammaProd(Ns*Ns - 1);
     result.corr.resize(Ns*Ns);
diff --git a/extras/Hadrons/Modules/MGauge/Load.cc b/extras/Hadrons/Modules/MGauge/Load.cc
index 276c08b21..1a6cec0a9 100644
--- a/extras/Hadrons/Modules/MGauge/Load.cc
+++ b/extras/Hadrons/Modules/MGauge/Load.cc
@@ -32,7 +32,7 @@ using namespace Hadrons;
 using namespace MGauge;
 
 /******************************************************************************
-*                          Load implementation                               *
+*                           Load implementation                               *
 ******************************************************************************/
 // constructor /////////////////////////////////////////////////////////////////
 Load::Load(const std::string name)
diff --git a/extras/Hadrons/Modules/MGauge/Random.cc b/extras/Hadrons/Modules/MGauge/Random.cc
index 587c5c259..6d5e0ec9e 100644
--- a/extras/Hadrons/Modules/MGauge/Random.cc
+++ b/extras/Hadrons/Modules/MGauge/Random.cc
@@ -32,7 +32,7 @@ using namespace Hadrons;
 using namespace MGauge;
 
 /******************************************************************************
-*                          Random implementation                             *
+*                           Random implementation                             *
 ******************************************************************************/
 // constructor /////////////////////////////////////////////////////////////////
 Random::Random(const std::string name)
diff --git a/extras/Hadrons/Modules/MGauge/Unit.cc b/extras/Hadrons/Modules/MGauge/Unit.cc
index 232bd835c..b9cfeac78 100644
--- a/extras/Hadrons/Modules/MGauge/Unit.cc
+++ b/extras/Hadrons/Modules/MGauge/Unit.cc
@@ -32,7 +32,7 @@ using namespace Hadrons;
 using namespace MGauge;
 
 /******************************************************************************
-*                            Unit implementation                             *
+*                             Unit implementation                             *
 ******************************************************************************/
 // constructor /////////////////////////////////////////////////////////////////
 Unit::Unit(const std::string name)
diff --git a/extras/Hadrons/Modules/MSolver/RBPrecCG.cc b/extras/Hadrons/Modules/MSolver/RBPrecCG.cc
index 2c3d9f67b..9cdd05aad 100644
--- a/extras/Hadrons/Modules/MSolver/RBPrecCG.cc
+++ b/extras/Hadrons/Modules/MSolver/RBPrecCG.cc
@@ -33,7 +33,7 @@ using namespace Hadrons;
 using namespace MSolver;
 
 /******************************************************************************
-*                       RBPrecCG implementation                            *
+*                          RBPrecCG implementation                            *
 ******************************************************************************/
 // constructor /////////////////////////////////////////////////////////////////
 RBPrecCG::RBPrecCG(const std::string name)