diff --git a/include/sot/core/device.hh b/include/sot/core/device.hh
index d395c850f8ea6910cf83b8409f0ca0f2caa26ae3..af915d00e8370c13bec075075fe5e744b1bde2b0 100644
--- a/include/sot/core/device.hh
+++ b/include/sot/core/device.hh
@@ -48,17 +48,17 @@ namespace dynamicgraph {
     public:
       static const std::string CLASS_NAME;
       virtual const std::string& getClassName(void) const {
-    return CLASS_NAME;
+	return CLASS_NAME;
       }
-
+      
       enum ForceSignalSource
       {
-    FORCE_SIGNAL_RLEG,
-    FORCE_SIGNAL_LLEG,
-    FORCE_SIGNAL_RARM,
-    FORCE_SIGNAL_LARM
+	FORCE_SIGNAL_RLEG,
+	FORCE_SIGNAL_LLEG,
+	FORCE_SIGNAL_RARM,
+	FORCE_SIGNAL_LARM
       };
-
+      
     protected:
       ml::Vector state_;
       ml::Vector velocity_;
@@ -69,24 +69,24 @@ namespace dynamicgraph {
       PeriodicCall periodicCallBefore_;
       PeriodicCall periodicCallAfter_;
     public:
-
+      
       /* --- CONSTRUCTION --- */
       Device(const std::string& name);
       /* --- DESTRUCTION --- */
       virtual ~Device();
-
+      
       virtual void setStateSize(const unsigned int& size);
       virtual void setState(const ml::Vector& st);
       void setVelocitySize(const unsigned int& size);
       virtual void setVelocity(const ml::Vector & vel);
       virtual void setSecondOrderIntegration();
       virtual void increment(const double & dt = 5e-2);
-
+      
     public: /* --- DISPLAY --- */
       virtual void display(std::ostream& os) const;
       SOT_CORE_EXPORT friend std::ostream&
-    operator<<(std::ostream& os,const Device& r) {
-    r.display(os); return os;
+	operator<<(std::ostream& os,const Device& r) {
+	r.display(os); return os;
       }
 
     public: /* --- SIGNALS --- */
@@ -110,11 +110,11 @@ namespace dynamicgraph {
 
     public: /* --- COMMANDS --- */
       void commandLine(const std::string&, std::istringstream&,
-               std::ostream&){}
+		       std::ostream&){}
     protected:
       /// Compute roll pitch yaw angles of freeflyer joint.
       void integrateRollPitchYaw(ml::Vector& state, const ml::Vector& control,
-                 double dt);
+				 double dt);
       /// Store Position of free flyer joint
       MatrixHomogeneous ffPose_;
       /// Compute the new position, from the current control.