diff --git a/eo/src/eoLinearTopology.h b/eo/src/eoLinearTopology.h
index a9dff1e3c..cec66845a 100644
--- a/eo/src/eoLinearTopology.h
+++ b/eo/src/eoLinearTopology.h
@@ -40,8 +40,8 @@
  *
  *  @ingroup Selectors
  */
-template < class POT > class eoLinearTopology:public eoTopology <
-            POT >
+template<class POT>
+class eoLinearTopology : public eoTopology<POT>
 {
 
 public:
diff --git a/eo/src/eoTopology.h b/eo/src/eoTopology.h
index 86fd214f3..08ded01a1 100644
--- a/eo/src/eoTopology.h
+++ b/eo/src/eoTopology.h
@@ -39,7 +39,8 @@
  * @ingroup Selectors
  * @ingroup Core
  */
-template < class POT > class eoTopology:public eoPop < POT >
+template<class POT>
+class eoTopology : public eoPop<POT>
 {
 public:
 
diff --git a/eo/src/eoVectorParticle.h b/eo/src/eoVectorParticle.h
index 773234752..00f3f2055 100644
--- a/eo/src/eoVectorParticle.h
+++ b/eo/src/eoVectorParticle.h
@@ -39,9 +39,8 @@
  * tree templates arguments are required: the fitness type (which is also the type of the
  * particle's best fitness), the position type and the velocity type.
  */
-template < class FitT, class PositionType, class VelocityType > class eoVectorParticle:public PO < FitT >,
-            public std::vector <
-            PositionType >
+template < class FitT, class PositionType, class VelocityType >
+class eoVectorParticle : public PO < FitT >, public std::vector < PositionType >
 {
 
 public: