diff --git a/include/turtle/detail/action.hpp b/include/turtle/detail/action.hpp
index 53f830f..f261d57 100644
--- a/include/turtle/detail/action.hpp
+++ b/include/turtle/detail/action.hpp
@@ -100,11 +100,11 @@ namespace detail
         }
 
         template< typename Value >
-        void moves( BOOST_RV_REF( Value ) v )
+        void moves( BOOST_RV_REF(Value) v )
         {
             this->set(
                 boost::bind(
-                    &boost::move< BOOST_RV_REF( Value ) >,
+                    &boost::move< BOOST_RV_REF(Value) >,
                     boost::ref( store( boost::move( v ) ) ) ) );
         }
 
@@ -124,7 +124,7 @@ namespace detail
                     >::type
                 >::type value_type;
 
-            value_imp( BOOST_RV_REF( value_type ) t )
+            value_imp( BOOST_RV_REF(value_type) t )
                 : t_( boost::move( t ) )
             {}
             value_imp( const T& t )
@@ -138,7 +138,7 @@ namespace detail
         };
 
         template< typename T >
-        T& store( BOOST_RV_REF( T ) t )
+        T& store( BOOST_RV_REF(T) t )
         {
             v_.reset( new value_imp< T >( boost::move( t ) ) );
             return static_cast< value_imp< T >& >( *v_ ).t_;
diff --git a/include/turtle/detail/expectation_template.hpp b/include/turtle/detail/expectation_template.hpp
index a4f14a0..0c2ac58 100644
--- a/include/turtle/detail/expectation_template.hpp
+++ b/include/turtle/detail/expectation_template.hpp
@@ -91,7 +91,7 @@ namespace detail
     template< typename F,
         BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, typename T) >
     class multi_matcher< F, void( BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, T) ) >
-        : public matcher_base< void( BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS,T) ) >
+        : public matcher_base< void( BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, T) ) >
     {
     public:
         multi_matcher( const F& f )
@@ -102,7 +102,7 @@ namespace detail
         virtual bool operator()(
             BOOST_PP_ENUM_BINARY_PARAMS( MOCK_NUM_ARGS, T, a ) )
         {
-            return f_( BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, a ) );
+            return f_( BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, a) );
         }
         virtual void serialize( std::ostream& s ) const
         {
diff --git a/include/turtle/detail/function_impl_template.hpp b/include/turtle/detail/function_impl_template.hpp
index 32f04b3..19cd6ff 100644
--- a/include/turtle/detail/function_impl_template.hpp
+++ b/include/turtle/detail/function_impl_template.hpp
@@ -144,6 +144,7 @@ namespace detail
                     BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, c) );
                 return *this;
             }
+
 #if MOCK_NUM_ARGS > 1
             template< typename Constraint >
             wrapper with( const Constraint& c )