diff --git a/websocketpp/endpoint.hpp b/websocketpp/endpoint.hpp
index 4072b9a999..04a2835d4b 100644
--- a/websocketpp/endpoint.hpp
+++ b/websocketpp/endpoint.hpp
@@ -266,23 +266,23 @@ public:
     void interrupt(connection_hdl hdl, lib::error_code & ec);
     void interrupt(connection_hdl hdl);
 
-    void send(connection_hdl hdl, const std::string& payload, 
+    void send(connection_hdl hdl, std::string const & payload, 
         frame::opcode::value op, lib::error_code & ec);
-    void send(connection_hdl hdl, const std::string& payload,
+    void send(connection_hdl hdl, std::string const & payload,
         frame::opcode::value op);
         
-    void send(connection_hdl hdl, const void* payload, size_t len,
+    void send(connection_hdl hdl, void const * payload, size_t len,
         frame::opcode::value op, lib::error_code & ec);
-    void send(connection_hdl hdl, const void* payload, size_t len,
+    void send(connection_hdl hdl, void const * payload, size_t len,
         frame::opcode::value op);
 
     void send(connection_hdl hdl, message_ptr msg, lib::error_code & ec);
     void send(connection_hdl hdl, message_ptr msg);
     
-    void close(connection_hdl hdl, const close::status::value code, 
-        const std::string & reason, lib::error_code & ec);
-    void close(connection_hdl hdl, const close::status::value code, 
-        const std::string & reason);
+    void close(connection_hdl hdl, close::status::value const code, 
+        std::string const & reason, lib::error_code & ec);
+    void close(connection_hdl hdl, close::status::value const code, 
+        std::string const & reason);
 
     /// Send a ping to a specific connection
     /**
@@ -386,7 +386,7 @@ private:
     std::set<connection_ptr>    m_connections;
     
     // static settings
-    const bool                  m_is_server;
+    bool const                  m_is_server;
     
     // endpoint state
     mutex_type                  m_mutex;
diff --git a/websocketpp/impl/endpoint_impl.hpp b/websocketpp/impl/endpoint_impl.hpp
index d4604fd8ce..33c8d24d31 100644
--- a/websocketpp/impl/endpoint_impl.hpp
+++ b/websocketpp/impl/endpoint_impl.hpp
@@ -109,8 +109,8 @@ void endpoint<connection,config>::interrupt(connection_hdl hdl) {
 }
 
 template <typename connection, typename config>
-void endpoint<connection,config>::send(connection_hdl hdl, 
-    const std::string& payload, frame::opcode::value op, lib::error_code & ec)
+void endpoint<connection,config>::send(connection_hdl hdl, std::string const & 
+    payload, frame::opcode::value op, lib::error_code & ec)
 {
     connection_ptr con = get_con_from_hdl(hdl,ec);
     if (ec) {return;}
@@ -119,7 +119,7 @@ void endpoint<connection,config>::send(connection_hdl hdl,
 }
 
 template <typename connection, typename config>
-void endpoint<connection,config>::send(connection_hdl hdl, const std::string& 
+void endpoint<connection,config>::send(connection_hdl hdl, std::string const & 
     payload, frame::opcode::value op)
 {
     lib::error_code ec;
@@ -128,7 +128,7 @@ void endpoint<connection,config>::send(connection_hdl hdl, const std::string&
 }
 
 template <typename connection, typename config>
-void endpoint<connection,config>::send(connection_hdl hdl, const void * payload,
+void endpoint<connection,config>::send(connection_hdl hdl, void const * payload,
     size_t len, frame::opcode::value op, lib::error_code & ec)
 {
     connection_ptr con = get_con_from_hdl(hdl,ec);
@@ -137,7 +137,7 @@ void endpoint<connection,config>::send(connection_hdl hdl, const void * payload,
 }
 
 template <typename connection, typename config>
-void endpoint<connection,config>::send(connection_hdl hdl, const void * payload,
+void endpoint<connection,config>::send(connection_hdl hdl, void const * payload,
     size_t len, frame::opcode::value op)
 {
     lib::error_code ec;
@@ -162,8 +162,8 @@ void endpoint<connection,config>::send(connection_hdl hdl, message_ptr msg) {
 }
 
 template <typename connection, typename config>
-void endpoint<connection,config>::close(connection_hdl hdl, 
-    const close::status::value code, const std::string & reason, 
+void endpoint<connection,config>::close(connection_hdl hdl, close::status::value
+    const code, std::string const & reason, 
     lib::error_code & ec)
 {
     connection_ptr con = get_con_from_hdl(hdl,ec);
@@ -172,8 +172,8 @@ void endpoint<connection,config>::close(connection_hdl hdl,
 }
     
 template <typename connection, typename config>
-void endpoint<connection,config>::close(connection_hdl hdl, 
-    const close::status::value code, const std::string & reason)
+void endpoint<connection,config>::close(connection_hdl hdl, close::status::value
+    const code, std::string const & reason)
 {
     lib::error_code ec;
     close(hdl,code,reason,ec);