diff --git a/src/ctbutterfly/ctbutterfly.hpp b/src/ctbutterfly/ctbutterfly.hpp
index c27ee6d..d30617f 100644
--- a/src/ctbutterfly/ctbutterfly.hpp
+++ b/src/ctbutterfly/ctbutterfly.hpp
@@ -80,10 +80,10 @@ protected:
     void get_parameters(void);
 
     // User parameters
-    std::string m_srcname;    //!< Name of source to compute butterfly
-    std::string m_outfile;    //!< Output ascii file
-    GEbounds    m_ebounds;    //!< Energy binning definition
-    bool          m_apply_edisp; //!< Apply energy dispersion?
+    std::string m_srcname;     //!< Name of source to compute butterfly
+    std::string m_outfile;     //!< Output ascii file
+    GEbounds    m_ebounds;     //!< Energy binning definition
+    bool        m_apply_edisp; //!< Apply energy dispersion?
 
     // Protected members
     GObservations       m_obs;        //!< Observation container
diff --git a/src/ctbutterfly/ctbutterfly.par b/src/ctbutterfly/ctbutterfly.par
index 6fd17c1..aa62f73 100644
--- a/src/ctbutterfly/ctbutterfly.par
+++ b/src/ctbutterfly/ctbutterfly.par
@@ -25,9 +25,9 @@ psfcube,  f, a, "NONE",,, "PSF cube file (only needed for stacked analysis)"
 bkgcube,  f, a, "NONE",,, "Background cube file (only needed for stacked analysis)"
 caldb,    s, a, "prod2",,, "Calibration database"
 irf,      s, a, "South_50h",,, "Instrument response function"
+edisp,    b, h, no,,, "Apply energy dispersion?"
 outfile,  f, a, "butterfly.txt",,, "Output ascii file"
 matrix,   f, h, "NONE",,, "Input covariance Matrix FITS file"
-edisp,    b, h, no,,, "Apply energy dispersion?"
 
 #
 # Energy binning parameters
diff --git a/src/cterror/cterror.hpp b/src/cterror/cterror.hpp
index eac6e14..fbdb669 100644
--- a/src/cterror/cterror.hpp
+++ b/src/cterror/cterror.hpp
@@ -78,7 +78,7 @@ protected:
     double        m_tol;          //!< Tolerance for limit determination
     int           m_max_iter;     //!< Maximum number of iterations
     double        m_value;        //!< Parameter value 
-    bool          m_apply_edisp; //!< Apply energy dispersion?
+    bool          m_apply_edisp;  //!< Apply energy dispersion?
 
     // Protected members
     GObservations m_obs;          //!< Observation container
diff --git a/src/cttsmap/cttsmap.hpp b/src/cttsmap/cttsmap.hpp
index 9cf2a8f..f2ce58a 100644
--- a/src/cttsmap/cttsmap.hpp
+++ b/src/cttsmap/cttsmap.hpp
@@ -84,22 +84,22 @@ protected:
     void init_maps(const GSkyMap& map);
 
     // User parameters
-    std::string              m_srcname;    //!< Name of source which is moved around
-    std::string              m_outmap;     //!< Output counts map or XML file
-    bool          m_apply_edisp; //!< Apply energy dispersion?
+    std::string              m_srcname;     //!< Name of source which is moved around
+    std::string              m_outmap;      //!< Output counts map or XML file
+    bool                     m_apply_edisp; //!< Apply energy dispersion?
 
     // Parameters to control speed and job splitting
-    int                      m_binmin;     //!< Map bin number from which computation should start
-    int                      m_binmax;     //!< Map bin number where map computation should end
-    double                   m_logL0;      //!< Likelihood value of null hypothesis
+    int                      m_binmin;      //!< Map bin number from which computation should start
+    int                      m_binmax;      //!< Map bin number where map computation should end
+    double                   m_logL0;       //!< Likelihood value of null hypothesis
 
     // Protected members
-    GObservations            m_obs;        //!< Observation container
-    GSkyMap                  m_tsmap;      //!< TS map
-    GSkyMap                  m_statusmap;  //!< Map of computed bins
-    std::vector<std::string> m_mapnames;   //!< Names of free parameters
-    std::vector<GSkyMap>     m_maps;       //!< Sky maps for each free parameter
-    GModel*                  m_testsource; //!< Pointer to test source for TS computation
+    GObservations            m_obs;         //!< Observation container
+    GSkyMap                  m_tsmap;       //!< TS map
+    GSkyMap                  m_statusmap;   //!< Map of computed bins
+    std::vector<std::string> m_mapnames;    //!< Names of free parameters
+    std::vector<GSkyMap>     m_maps;        //!< Sky maps for each free parameter
+    GModel*                  m_testsource;  //!< Pointer to test source for TS computation
 };
 
 
diff --git a/src/cttsmap/cttsmap.par b/src/cttsmap/cttsmap.par
index f3f35f9..d3bd20b 100644
--- a/src/cttsmap/cttsmap.par
+++ b/src/cttsmap/cttsmap.par
@@ -25,8 +25,8 @@ psfcube, f, a, "NONE",,, "PSF cube file (only needed for stacked analysis)"
 bkgcube, f, a, "NONE",,, "Background cube file (only needed for stacked analysis)"
 caldb,   s, a, "prod2",,, "Calibration database"
 irf,     s, a, "South_50h",,, "Instrument response function"
-outmap,  f, a, "tsmap.fits",,, "Output Test Statistic map"
 edisp,    b, h, no,,, "Apply energy dispersion?"
+outmap,  f, a, "tsmap.fits",,, "Output Test Statistic map"
 
 #
 # Spatial binning parameters
diff --git a/src/ctulimit/ctulimit.hpp b/src/ctulimit/ctulimit.hpp
index 155dea1..0176ad6 100644
--- a/src/ctulimit/ctulimit.hpp
+++ b/src/ctulimit/ctulimit.hpp
@@ -93,7 +93,7 @@ protected:
     double        m_emax;         //!< Maximum energy for flux limits (TeV)
     double        m_tol;          //!< Tolerance for limit determination
     int           m_max_iter;     //!< Maximum number of iterations
-    bool          m_apply_edisp; //!< Apply energy dispersion?
+    bool          m_apply_edisp;  //!< Apply energy dispersion?
 
     // Protected members
     GObservations m_obs;          //!< Observation container