diff --git a/src/Base/Unit.cpp b/src/Base/Unit.cpp
index d76dc42d3f..7cb908b999 100644
--- a/src/Base/Unit.cpp
+++ b/src/Base/Unit.cpp
@@ -238,175 +238,212 @@ Unit& Unit::operator = (const Unit &New)
 
 QString Unit::getString(void) const
 {
-	std::stringstream ret;
+    std::stringstream ret;
 
-	if(isEmpty())
-		return QString();
+    if (isEmpty())
+        return QString();
 
-	if(Sig.Length                  > 0 ||
-           Sig.Mass                    > 0 ||
-           Sig.Time                    > 0 ||
-           Sig.ElectricCurrent         > 0 ||
-           Sig.ThermodynamicTemperature> 0 ||
-           Sig.AmountOfSubstance       > 0 ||
-           Sig.LuminoseIntensity       > 0 ||
-           Sig.Angle                   > 0 ||
-           Sig.Density                 > 0 ){
+    if (Sig.Length                  > 0 ||
+        Sig.Mass                    > 0 ||
+        Sig.Time                    > 0 ||
+        Sig.ElectricCurrent         > 0 ||
+        Sig.ThermodynamicTemperature> 0 ||
+        Sig.AmountOfSubstance       > 0 ||
+        Sig.LuminoseIntensity       > 0 ||
+        Sig.Angle                   > 0 ||
+        Sig.Density                 > 0 ){
 
-            bool mult = false;
-            if(Sig.Length > 0){
-                mult = true;
-                ret << "mm";
-                if(Sig.Length >1)
-                    ret << "^" << Sig.Length;
-            }
-            if(Sig.Mass > 0){
-                if(mult) ret<<'*';
-                mult = true;
-                ret << "kg";
-                if(Sig.Mass >1)
-                    ret << "^" << Sig.Mass;
-            }
-            if(Sig.Time > 0){
-                if(mult) ret<<'*';
-                mult = true;
-                ret << "s";
-                if(Sig.Time >1)
-                    ret << "^" << Sig.Time;
-            }
-            if(Sig.ElectricCurrent > 0){
-                if(mult) ret<<'*';
-                mult = true;
-                ret << "A";
-                if(Sig.ElectricCurrent >1)
-                    ret << "^" << Sig.ElectricCurrent;
-            }
-            if(Sig.ThermodynamicTemperature > 0){
-                if(mult) ret<<'*';
-                mult = true;
-                ret << "K";
-                if(Sig.ThermodynamicTemperature >1)
-                    ret << "^" << Sig.ThermodynamicTemperature;
-            }
-            if(Sig.AmountOfSubstance > 0){
-                if(mult) ret<<'*';
-                mult = true;
-                ret << "mol";
-                if(Sig.AmountOfSubstance >1)
-                    ret << "^" << Sig.AmountOfSubstance;
-            }
-            if(Sig.LuminoseIntensity > 0){
-                if(mult) ret<<'*';
-                mult = true;
-                ret << "cd";
-                if(Sig.LuminoseIntensity >1)
-                    ret << "^" << Sig.LuminoseIntensity;
-            }
-            if(Sig.Angle > 0){
-                if(mult) ret<<'*';
-                mult = true;
-                ret << "deg";
-                if(Sig.Angle >1)
-                    ret << "^" << Sig.Angle;
-            }
-            if(Sig.Density > 0){
-                if(mult) ret<<'*';
-                mult = true;
-                ret << "kg/m^3";
-                if(Sig.Density >1)
-                    ret << "^" << Sig.Density;
-            }
-        }else{
-		ret << "1";
-	}
-
-	if(Sig.Length                  < 0 ||
-           Sig.Mass                    < 0 ||
-           Sig.Time                    < 0 ||
-           Sig.ElectricCurrent         < 0 ||
-           Sig.ThermodynamicTemperature< 0 ||
-           Sig.AmountOfSubstance       < 0 ||
-           Sig.LuminoseIntensity       < 0 ||
-           Sig.Angle                   < 0 ||
-           Sig.Density                 < 0 ){
-            ret << "/";
-
-            int nnom = Sig.Length<0?1:2 +
-                Sig.Mass<0?1:2 +
-                Sig.Time<0?1:2 +
-                Sig.ElectricCurrent<0?1:2 +
-                Sig.ThermodynamicTemperature<0?1:2 +
-                Sig.AmountOfSubstance<0?1:2 +
-                Sig.LuminoseIntensity<0?1:2 +
-                Sig.Angle<0?1:2 +
-                Sig.Density<0?1:2 ;
-            if (nnom > 1) ret << '(';
-            bool mult=false;
-            if(Sig.Length < 0){
-                ret << "mm";
-                mult = true;
-                if(Sig.Length <-1)
-                    ret << "^" << abs(Sig.Length);
-            }
-            if(Sig.Mass < 0){
-                if(mult) ret<<'*';
-                mult = true;
-                ret << "kg";
-                if(Sig.Mass <-1)
-                    ret << "^" << abs(Sig.Mass);
-            }
-            if(Sig.Time < 0){
-                if(mult) ret<<'*';
-                mult = true;
-                ret << "s";
-                if(Sig.Time <-1)
-                    ret << "^" << abs(Sig.Time);
-            }
-            if(Sig.ElectricCurrent < 0){
-                if(mult) ret<<'*';
-                mult = true;
-                ret << "A";
-                if(Sig.ElectricCurrent <-1)
-                    ret << "^" << abs(Sig.ElectricCurrent);
-            }
-            if(Sig.ThermodynamicTemperature < 0){
-                if(mult) ret<<'*';
-                mult = true;
-                ret << "K";
-                if(Sig.ThermodynamicTemperature <-1)
-                    ret << "^" << abs(Sig.ThermodynamicTemperature);
-            }
-            if(Sig.AmountOfSubstance < 0){
-                if(mult) ret<<'*';
-                mult = true;
-                ret << "mol";
-                if(Sig.AmountOfSubstance <-1)
-                    ret << "^" << abs(Sig.AmountOfSubstance);
-            }
-            if(Sig.LuminoseIntensity < 0){
-                if(mult) ret<<'*';
-                mult = true;
-                ret << "cd";
-                if(Sig.LuminoseIntensity <-1)
-                    ret << "^" << abs(Sig.LuminoseIntensity);
-            }
-            if(Sig.Angle < 0){
-                if(mult) ret<<'*';
-                mult = true;
-                ret << "deg";
-                if(Sig.Angle <-1)
-                    ret << "^" << abs(Sig.Angle);
-            }
-            if(Sig.Density < 0){
-                if(mult) ret<<'*';
-                mult = true;
-                ret << "kg/m^3";
-                if(Sig.Density <-1)
-                    ret << "^" << abs(Sig.Density);
-            }
-            if (nnom > 1) ret << ')';
+        bool mult = false;
+        if (Sig.Length > 0) {
+            mult = true;
+            ret << "mm";
+            if (Sig.Length > 1)
+                ret << "^" << Sig.Length;
         }
 
+        if (Sig.Mass > 0) {
+            if (mult)
+                ret<<'*';
+            mult = true;
+            ret << "kg";
+            if (Sig.Mass > 1)
+                ret << "^" << Sig.Mass;
+        }
+
+        if (Sig.Time > 0) {
+            if (mult)
+                ret<<'*';
+            mult = true;
+            ret << "s";
+            if (Sig.Time > 1)
+                ret << "^" << Sig.Time;
+        }
+
+        if (Sig.ElectricCurrent > 0) {
+            if (mult) ret<<'*';
+                mult = true;
+            ret << "A";
+            if (Sig.ElectricCurrent > 1)
+                ret << "^" << Sig.ElectricCurrent;
+        }
+
+        if (Sig.ThermodynamicTemperature > 0) {
+            if (mult)
+                ret<<'*';
+            mult = true;
+            ret << "K";
+            if (Sig.ThermodynamicTemperature > 1)
+                ret << "^" << Sig.ThermodynamicTemperature;
+        }
+
+        if (Sig.AmountOfSubstance > 0){
+            if (mult)
+                ret<<'*';
+            mult = true;
+            ret << "mol";
+            if (Sig.AmountOfSubstance > 1)
+                ret << "^" << Sig.AmountOfSubstance;
+        }
+
+        if (Sig.LuminoseIntensity > 0) {
+            if (mult)
+                ret<<'*';
+            mult = true;
+            ret << "cd";
+            if (Sig.LuminoseIntensity > 1)
+                ret << "^" << Sig.LuminoseIntensity;
+        }
+
+        if (Sig.Angle > 0) {
+            if (mult)
+                ret<<'*';
+            mult = true;
+            ret << "deg";
+            if (Sig.Angle > 1)
+                ret << "^" << Sig.Angle;
+        }
+
+        if (Sig.Density > 0) {
+            if (mult)
+                ret<<'*';
+            mult = true;
+            ret << "kg/m^3";
+            if (Sig.Density > 1)
+                ret << "^" << Sig.Density;
+        }
+    }
+    else {
+        ret << "1";
+    }
+
+    if (Sig.Length                  < 0 ||
+        Sig.Mass                    < 0 ||
+        Sig.Time                    < 0 ||
+        Sig.ElectricCurrent         < 0 ||
+        Sig.ThermodynamicTemperature< 0 ||
+        Sig.AmountOfSubstance       < 0 ||
+        Sig.LuminoseIntensity       < 0 ||
+        Sig.Angle                   < 0 ||
+        Sig.Density                 < 0 ){
+        ret << "/";
+
+        int nnom = Sig.Length<0?1:2 +
+                   Sig.Mass<0?1:2 +
+                   Sig.Time<0?1:2 +
+                   Sig.ElectricCurrent<0?1:2 +
+                   Sig.ThermodynamicTemperature<0?1:2 +
+                   Sig.AmountOfSubstance<0?1:2 +
+                   Sig.LuminoseIntensity<0?1:2 +
+                   Sig.Angle<0?1:2 +
+                   Sig.Density<0?1:2 ;
+
+        if (nnom > 1)
+            ret << '(';
+
+        bool mult=false;
+        if (Sig.Length < 0) {
+            ret << "mm";
+            mult = true;
+            if (Sig.Length < -1)
+                ret << "^" << abs(Sig.Length);
+        }
+
+        if (Sig.Mass < 0) {
+            if(mult)
+                ret<<'*';
+            mult = true;
+            ret << "kg";
+            if (Sig.Mass < -1)
+                ret << "^" << abs(Sig.Mass);
+        }
+
+        if (Sig.Time < 0) {
+            if(mult)
+                ret<<'*';
+            mult = true;
+            ret << "s";
+            if (Sig.Time < -1)
+                ret << "^" << abs(Sig.Time);
+        }
+
+        if (Sig.ElectricCurrent < 0) {
+            if(mult)
+                ret<<'*';
+            mult = true;
+            ret << "A";
+            if (Sig.ElectricCurrent < -1)
+                ret << "^" << abs(Sig.ElectricCurrent);
+        }
+
+        if (Sig.ThermodynamicTemperature < 0) {
+            if (mult)
+                ret<<'*';
+            mult = true;
+            ret << "K";
+            if (Sig.ThermodynamicTemperature < -1)
+                ret << "^" << abs(Sig.ThermodynamicTemperature);
+        }
+
+        if (Sig.AmountOfSubstance < 0) {
+            if (mult)
+                ret<<'*';
+            mult = true;
+            ret << "mol";
+            if (Sig.AmountOfSubstance < -1)
+                ret << "^" << abs(Sig.AmountOfSubstance);
+        }
+
+        if (Sig.LuminoseIntensity < 0) {
+            if (mult)
+                ret<<'*';
+            mult = true;
+            ret << "cd";
+            if (Sig.LuminoseIntensity < -1)
+                ret << "^" << abs(Sig.LuminoseIntensity);
+        }
+
+        if (Sig.Angle < 0) {
+            if (mult)
+                ret<<'*';
+            mult = true;
+            ret << "deg";
+            if (Sig.Angle < -1)
+                ret << "^" << abs(Sig.Angle);
+        }
+
+        if (Sig.Density < 0) {
+            if (mult)
+                ret<<'*';
+            mult = true;
+            ret << "kg/m^3";
+            if (Sig.Density < -1)
+                ret << "^" << abs(Sig.Density);
+        }
+
+        if (nnom > 1)
+            ret << ')';
+    }
+
     return QString::fromUtf8(ret.str().c_str());
 }
 
diff --git a/src/Base/UnitPyImp.cpp b/src/Base/UnitPyImp.cpp
index 077b6b8d55..0f2fabde71 100644
--- a/src/Base/UnitPyImp.cpp
+++ b/src/Base/UnitPyImp.cpp
@@ -1,12 +1,12 @@
 
 #include "PreCompiled.h"
 
-#include "Base/Unit.h"
+#include <Base/Unit.h>
 
 // inclusion of the generated files (generated out of UnitPy.xml)
-#include "UnitPy.h"
-#include "QuantityPy.h"
-#include "UnitPy.cpp"
+#include <Base/UnitPy.h>
+#include <Base/QuantityPy.h>
+#include <Base/UnitPy.cpp>
 
 using namespace Base;
 
@@ -14,9 +14,9 @@ using namespace Base;
 std::string UnitPy::representation(void) const
 {
     const UnitSignature &  Sig = getUnitPtr()->getSignature();
-	std::stringstream ret;
+    std::stringstream ret;
     ret << "Unit: "; 
-	ret << getUnitPtr()->getString().toUtf8().constData() << " (";
+    ret << getUnitPtr()->getString().toUtf8().constData() << " (";
     ret << Sig.Length << ",";                 
     ret << Sig.Mass  << ",";                    
     ret << Sig.Time  << ",";                   
@@ -29,7 +29,7 @@ std::string UnitPy::representation(void) const
     if(! type.empty())
         ret << " [" << type << "]";
 
-	return ret.str();
+    return ret.str();
 }
 
 PyObject *UnitPy::PyMake(struct _typeobject *, PyObject *, PyObject *)  // Python wrapper
@@ -311,5 +311,3 @@ PyObject * UnitPy::number_hex_handler (PyObject *self)
     PyErr_SetString(PyExc_NotImplementedError, "Not implemented");
     return 0;
 }
-
-