diff --git a/turtle/detail/expectation_base.hpp b/turtle/detail/expectation_base.hpp
index ba77849..ba5d5db 100644
--- a/turtle/detail/expectation_base.hpp
+++ b/turtle/detail/expectation_base.hpp
@@ -10,8 +10,8 @@
 #define MOCK_EXPECTATION_BASE_HPP_INCLUDED
 
 #include "../config.hpp"
-#include "invocation.hpp"
 #include "../sequence.hpp"
+#include "invocation.hpp"
 #include <boost/make_shared.hpp>
 #include <vector>
 
@@ -22,11 +22,6 @@ namespace detail
     class expectation_base
     {
     public:
-        expectation_base()
-            : i_( boost::make_shared< unlimited >() )
-            , file_( "unknown location" )
-            , line_( 0 )
-        {}
         void set_location( const char* file, int line )
         {
             file_ = file;
@@ -66,6 +61,11 @@ namespace detail
         }
 
     protected:
+        expectation_base()
+            : i_( boost::make_shared< unlimited >() )
+            , file_( "unknown location" )
+            , line_( 0 )
+        {}
         ~expectation_base()
         {
             for( sequences_cit it = sequences_.begin();
diff --git a/turtle/detail/function_impl_template.hpp b/turtle/detail/function_impl_template.hpp
index 18dd5f7..db5c403 100644
--- a/turtle/detail/function_impl_template.hpp
+++ b/turtle/detail/function_impl_template.hpp
@@ -39,8 +39,9 @@ namespace detail
     public:
         typedef MOCK_ERROR_POLICY< R > error_type;
 
-        typedef expectation< R ( BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, T) )
-            > expectation_type;
+        typedef expectation<
+                    R ( BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, T) )
+                > expectation_type;
 
     public:
         function_impl()