diff --git a/src/type_traits.h b/src/type_traits.h
index bef809ae..605aa63d 100644
--- a/src/type_traits.h
+++ b/src/type_traits.h
@@ -47,15 +47,15 @@ namespace etl
   template <typename T, const T VALUE>
   struct integral_constant
   {
-	  static const T value = VALUE;
+    static const T value = VALUE;
 
-	  typedef T value_type;
+    typedef T value_type;
     typedef integral_constant<T, VALUE> type;
 
-	  operator value_type() const
-	  {
-		   return value;
-	  }
+    operator value_type() const
+    {
+       return value;
+    }
   };
 
   /// integral_constant specialisations
@@ -250,9 +250,9 @@ namespace etl
 #else
   template <> struct make_signed<wchar_t>
   {
-	  typedef etl::conditional<sizeof(wchar_t) == sizeof(short), short,
-		        etl::conditional<sizeof(wchar_t) == sizeof(int),   int,
-		        etl::conditional<sizeof(wchar_t) == sizeof(long),  long, void>::type>::type>::type type;
+    typedef etl::conditional<sizeof(wchar_t) == sizeof(short), short,
+            etl::conditional<sizeof(wchar_t) == sizeof(int),   int,
+            etl::conditional<sizeof(wchar_t) == sizeof(long),  long, void>::type>::type>::type type;
   };
 #endif
   template <> struct make_signed<unsigned short> { typedef  short type; };
@@ -277,9 +277,9 @@ namespace etl
 #else
   template <> struct make_unsigned<wchar_t>
   {
-	  typedef etl::conditional<sizeof(wchar_t) == sizeof(unsigned short), unsigned short,
-		        etl::conditional<sizeof(wchar_t) == sizeof(unsigned int),   unsigned int,
-		        etl::conditional<sizeof(wchar_t) == sizeof(unsigned long),  unsigned long, void>::type>::type>::type type;
+    typedef etl::conditional<sizeof(wchar_t) == sizeof(unsigned short), unsigned short,
+            etl::conditional<sizeof(wchar_t) == sizeof(unsigned int),   unsigned int,
+            etl::conditional<sizeof(wchar_t) == sizeof(unsigned long),  unsigned long, void>::type>::type>::type type;
   };
 #endif
   template <> struct make_unsigned<int> { typedef unsigned int type; };
diff --git a/src/variant.h b/src/variant.h
index 2e8522ec..38492c4f 100644
--- a/src/variant.h
+++ b/src/variant.h
@@ -46,7 +46,7 @@ SOFTWARE.
 
 #if defined(ETL_COMPILER_KEIL)
   #pragma diag_suppress 940
-	#pragma diag_suppress 111
+  #pragma diag_suppress 111
 #endif
 
 #undef ETL_FILE