diff --git a/include/boost/typeof/encode_decode.hpp b/include/boost/typeof/encode_decode.hpp
index 67bf9e5..658fb77 100755
--- a/include/boost/typeof/encode_decode.hpp
+++ b/include/boost/typeof/encode_decode.hpp
@@ -8,7 +8,7 @@
 #include <boost/mpl/deref.hpp>
 #include <boost/mpl/next.hpp>
 
-namespace boost{namespace type_of{namespace{
+namespace boost { namespace type_of { namespace {
 
     template<class V, class Type_Not_Registered_With_Typeof_System> 
     struct encode_type_impl;
diff --git a/include/boost/typeof/int_encoding.hpp b/include/boost/typeof/int_encoding.hpp
index a708eaa..3078b69 100755
--- a/include/boost/typeof/int_encoding.hpp
+++ b/include/boost/typeof/int_encoding.hpp
@@ -8,7 +8,7 @@
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/size_t.hpp>
 
-namespace boost{namespace type_of{
+namespace boost { namespace type_of {
 
     template<class T> struct get_unsigned
     {
diff --git a/include/boost/typeof/modifiers.hpp b/include/boost/typeof/modifiers.hpp
index 45c806d..6049abb 100755
--- a/include/boost/typeof/modifiers.hpp
+++ b/include/boost/typeof/modifiers.hpp
@@ -35,7 +35,7 @@
 #define BOOST_TYPEOF_pointer_fun(T) T*
 #define BOOST_TYPEOF_reference_fun(T) T&
 
-namespace boost{namespace type_of{namespace{
+namespace boost { namespace type_of { namespace {
 
     BOOST_TYPEOF_modifier_support(BOOST_TYPEOF_UNIQUE_ID(), BOOST_TYPEOF_const_fun);
     BOOST_TYPEOF_modifier_support(BOOST_TYPEOF_UNIQUE_ID(), BOOST_TYPEOF_volatile_fun);
@@ -77,7 +77,7 @@ namespace boost{namespace type_of{namespace{
         typedef typename d::iter iter;\
     }
 
-namespace boost{namespace type_of{namespace{
+namespace boost { namespace type_of { namespace {
 
     BOOST_TYPEOF_array_support(BOOST_TYPEOF_UNIQUE_ID(), BOOST_PP_EMPTY());
     BOOST_TYPEOF_array_support(BOOST_TYPEOF_UNIQUE_ID(), const);
diff --git a/include/boost/typeof/register_functions.hpp b/include/boost/typeof/register_functions.hpp
index 0f749d8..fc53bfe 100755
--- a/include/boost/typeof/register_functions.hpp
+++ b/include/boost/typeof/register_functions.hpp
@@ -32,14 +32,11 @@ enum
     VOLATILE_CONST_MEM_FUN_ID       = FUN_ID + 6 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY)
 };
 
-namespace boost
-{
-    namespace type_of
-    {   
-        # define BOOST_PP_ITERATION_LIMITS (0, BOOST_TYPEOF_LIMIT_FUNCTION_ARITY)
-        # define BOOST_PP_FILENAME_1 <boost/typeof/register_functions_iterate.hpp>
-        # include BOOST_PP_ITERATE()
-    }
-}
+namespace boost { namespace type_of {
+
+    # define BOOST_PP_ITERATION_LIMITS (0, BOOST_TYPEOF_LIMIT_FUNCTION_ARITY)
+    # define BOOST_PP_FILENAME_1 <boost/typeof/register_functions_iterate.hpp>
+    # include BOOST_PP_ITERATE()
+}}
 
 #endif//BOOST_TYPEOF_REGISTER_FUNCTIONS_HPP_INCLUDED
diff --git a/include/boost/typeof/template_encoding.hpp b/include/boost/typeof/template_encoding.hpp
index d7b57c9..e3adc6e 100755
--- a/include/boost/typeof/template_encoding.hpp
+++ b/include/boost/typeof/template_encoding.hpp
@@ -125,7 +125,7 @@
         BOOST_TYPEOF_TYPEDEF_DECODED_TEMPLATE_TYPE)(Name,Params)
 
 #define BOOST_TYPEOF_REGISTER_TEMPLATE_IMPL(Name, Params, Size, ID)\
-    namespace boost{namespace type_of{namespace{\
+    namespace boost { namespace type_of { namespace {\
     BOOST_TYPEOF_REGISTER_TEMPLATE_TEMPLATE_IMPL(Name, Params, ID)\
     template<class V\
         BOOST_TYPEOF_SEQ_ENUM_TRAILING(Params, BOOST_TYPEOF_REGISTER_TEMPLATE_PARAM_PAIR)\
diff --git a/include/boost/typeof/template_template_param.hpp b/include/boost/typeof/template_template_param.hpp
index 870c92e..188414f 100755
--- a/include/boost/typeof/template_template_param.hpp
+++ b/include/boost/typeof/template_template_param.hpp
@@ -51,24 +51,23 @@
 ////////////////////////////
 // move to encode_decode?
 
-namespace boost
-{
-    namespace type_of 
-    {
-        namespace 
-        {
-            template<class V, class Type_Not_Registered_With_Typeof_System> struct encode_template_impl;
-            template<class T, class Iter> struct decode_template_impl;
-        }
-        template<class V, class T> struct encode_template
-            : encode_template_impl<V, T>
-        {};
+namespace boost { namespace type_of { 
 
-        template<class Iter> struct decode_template 
-            :   decode_template_impl<typename Iter::type, typename Iter::next>
-        {};
+    namespace 
+    {
+        template<class V, class Type_Not_Registered_With_Typeof_System> struct encode_template_impl;
+        template<class T, class Iter> struct decode_template_impl;
     }
-}
+
+    template<class V, class T> struct encode_template
+        : encode_template_impl<V, T>
+    {};
+
+    template<class Iter> struct decode_template 
+        :   decode_template_impl<typename Iter::type, typename Iter::next>
+    {};
+
+}}
 
 ////////////////////////////
 // move to template_encoding.hpp?
diff --git a/include/boost/typeof/type_encoding.hpp b/include/boost/typeof/type_encoding.hpp
index 07e69f6..76455a9 100755
--- a/include/boost/typeof/type_encoding.hpp
+++ b/include/boost/typeof/type_encoding.hpp
@@ -17,7 +17,7 @@
     };
 
 #define BOOST_TYPEOF_REGISTER_TYPE(Type)                                \
-    namespace boost{namespace type_of{namespace{                        \
+    namespace boost { namespace type_of { namespace {                   \
         BOOST_TYPEOF_REGISTER_TYPE_IMPL(Type, BOOST_TYPEOF_UNIQUE_ID()) \
     }}}
 
diff --git a/include/boost/typeof/vector.hpp b/include/boost/typeof/vector.hpp
index 4731958..96e3ce6 100755
--- a/include/boost/typeof/vector.hpp
+++ b/include/boost/typeof/vector.hpp
@@ -28,7 +28,7 @@
         typedef v_iter<V, mpl::int_<n + 1> > next;\
     };
 
-namespace boost{ namespace type_of{
+namespace boost { namespace type_of {
 
     template<class V, class Pos> struct v_iter; // not defined
     BOOST_PP_REPEAT(BOOST_TYPEOF_LIMIT_SIZE, BOOST_TYPEOF_spec_iter, ~)
@@ -53,7 +53,7 @@ namespace boost{ namespace type_of{
         BOOST_PP_REPEAT_FROM_TO(n, BOOST_TYPEOF_LIMIT_SIZE, BOOST_TYPEOF_typedef_fake_item, ~)\
     };
 
-namespace boost{ namespace type_of{
+namespace boost { namespace type_of {
 
     BOOST_PP_REPEAT(BOOST_PP_INC(BOOST_TYPEOF_LIMIT_SIZE), BOOST_TYPEOF_define_vector, ~)
 }}
@@ -73,7 +73,7 @@ namespace boost{ namespace type_of{
         > type;\
     };
 
-namespace boost{ namespace type_of{
+namespace boost { namespace type_of {
 
     template<class V, class T> struct push_back; // not defined
     BOOST_PP_REPEAT(BOOST_TYPEOF_LIMIT_SIZE, BOOST_TYPEOF_spec_push_back, ~)