diff --git a/websocketpp/connection.hpp b/websocketpp/connection.hpp
index 0bfb481f55..82e2a3a088 100644
--- a/websocketpp/connection.hpp
+++ b/websocketpp/connection.hpp
@@ -477,7 +477,7 @@ public:
      * the documentation for your transport policy for details about its
      * timer support.
      *
-     * @param dur The length of the open handshake timeout in ms 
+     * @param dur The length of the open handshake timeout in ms
      */
     void set_open_handshake_timeout(long dur) {
         m_open_handshake_timeout_dur = dur;
@@ -501,7 +501,7 @@ public:
      * the documentation for your transport policy for details about its
      * timer support.
      *
-     * @param dur The length of the close handshake timeout in ms 
+     * @param dur The length of the close handshake timeout in ms
      */
     void set_close_handshake_timeout(long dur) {
         m_close_handshake_timeout_dur = dur;
@@ -522,7 +522,7 @@ public:
      * the documentation for your transport policy for details about its
      * timer support.
      *
-     * @param dur The length of the pong timeout in ms 
+     * @param dur The length of the pong timeout in ms
      */
     void set_pong_timeout(long dur) {
         m_pong_timeout_dur = dur;
@@ -1286,7 +1286,7 @@ private:
     write_frame_handler     m_write_frame_handler;
 
     // static settings
-    const std::string       m_user_agent;
+    std::string const       m_user_agent;
 
     /// Pointer to the connection handle
     connection_hdl          m_connection_hdl;
diff --git a/websocketpp/endpoint.hpp b/websocketpp/endpoint.hpp
index df58332576..d0134c0e56 100644
--- a/websocketpp/endpoint.hpp
+++ b/websocketpp/endpoint.hpp
@@ -294,7 +294,7 @@ public:
      * the documentation for your transport policy for details about its
      * timer support.
      *
-     * @param dur The length of the open handshake timeout in ms 
+     * @param dur The length of the open handshake timeout in ms
      */
     void set_open_handshake_timeout(long dur) {
         scoped_lock_type guard(m_mutex);
@@ -319,7 +319,7 @@ public:
      * the documentation for your transport policy for details about its
      * timer support.
      *
-     * @param dur The length of the close handshake timeout in ms 
+     * @param dur The length of the close handshake timeout in ms
      */
     void set_close_handshake_timeout(long dur) {
         scoped_lock_type guard(m_mutex);
@@ -341,7 +341,7 @@ public:
      * the documentation for your transport policy for details about its
      * timer support.
      *
-     * @param dur The length of the pong timeout in ms 
+     * @param dur The length of the pong timeout in ms
      */
     void set_pong_timeout(long dur) {
         scoped_lock_type guard(m_mutex);