diff --git a/include/etl/private/to_string_helper.h b/include/etl/private/to_string_helper.h
index 60869664..e3e565a0 100644
--- a/include/etl/private/to_string_helper.h
+++ b/include/etl/private/to_string_helper.h
@@ -218,7 +218,8 @@ namespace etl
     /// Helper function for floating point nan and inf.
     //***************************************************************************
     template <typename TIString>
-    void add_nan_inf(const bool not_a_number, const bool infinity, const bool is_negative, TIString& str, const etl::basic_format_spec<TIString>& format)
+    void add_nan_inf(const bool not_a_number, const bool infinity, const bool is_negative, TIString& str,
+                     const etl::basic_format_spec<TIString>& format)
     {
       typedef typename TIString::value_type type;
 
@@ -427,7 +428,7 @@ namespace etl
     template <typename T, typename TIString>
     void add_floating_point(const T value, TIString& str, const etl::basic_format_spec<TIString>& format, const bool append)
     {
-      typedef typename TIString::iterator  iterator;
+      typedef typename TIString::iterator iterator;
 
       if (!append)
       {
diff --git a/test/test_to_string.cpp b/test/test_to_string.cpp
index df174100..3bc48283 100644
--- a/test/test_to_string.cpp
+++ b/test/test_to_string.cpp
@@ -28,9 +28,9 @@ SOFTWARE.
 
 #include "unit_test_framework.h"
 
-#include <sstream>
 #include <iomanip>
 #include <ostream>
+#include <sstream>
 
 #include "etl/format_spec.h"
 #include "etl/string.h"