diff --git a/client_http.hpp b/client_http.hpp
index 666b5f0..fb1fb23 100644
--- a/client_http.hpp
+++ b/client_http.hpp
@@ -152,7 +152,7 @@ namespace SimpleWeb {
     class Connection : public std::enable_shared_from_this<Connection> {
     public:
       template <typename... Args>
-      Connection(std::shared_ptr<ScopeRunner> handler_runner_, Args &&... args) noexcept
+      Connection(std::shared_ptr<ScopeRunner> handler_runner_, Args &&...args) noexcept
           : handler_runner(std::move(handler_runner_)), socket(new socket_type(std::forward<Args>(args)...)) {}
 
       std::shared_ptr<ScopeRunner> handler_runner;
diff --git a/server_http.hpp b/server_http.hpp
index 195249b..348e9db 100644
--- a/server_http.hpp
+++ b/server_http.hpp
@@ -283,7 +283,7 @@ namespace SimpleWeb {
     class Connection : public std::enable_shared_from_this<Connection> {
     public:
       template <typename... Args>
-      Connection(std::shared_ptr<ScopeRunner> handler_runner_, Args &&... args) noexcept : handler_runner(std::move(handler_runner_)), socket(new socket_type(std::forward<Args>(args)...)) {}
+      Connection(std::shared_ptr<ScopeRunner> handler_runner_, Args &&...args) noexcept : handler_runner(std::move(handler_runner_)), socket(new socket_type(std::forward<Args>(args)...)) {}
 
       std::shared_ptr<ScopeRunner> handler_runner;
 
@@ -517,7 +517,7 @@ namespace SimpleWeb {
     virtual void accept() = 0;
 
     template <typename... Args>
-    std::shared_ptr<Connection> create_connection(Args &&... args) noexcept {
+    std::shared_ptr<Connection> create_connection(Args &&...args) noexcept {
       auto connections = this->connections;
       auto connection = std::shared_ptr<Connection>(new Connection(handler_runner, std::forward<Args>(args)...), [connections](Connection *connection) {
         {
diff --git a/server_https.hpp b/server_https.hpp
index 7360c89..dc2476b 100644
--- a/server_https.hpp
+++ b/server_https.hpp
@@ -23,7 +23,7 @@ namespace SimpleWeb {
     /**
      * Constructs a server object.
      *
-     * @param certification_file If non-empty, sends the given certification file to client.
+     * @param certification_file Sends the given certification file to client.
      * @param private_key_file   Specifies the file containing the private key for certification_file.
      * @param verify_file        If non-empty, use this certificate authority file to perform verification of client's certificate and hostname according to RFC 2818.
      */