diff --git a/src/terminal/SshSetupHandler.cpp b/src/terminal/SshSetupHandler.cpp
index ae926b614..1b82928b2 100644
--- a/src/terminal/SshSetupHandler.cpp
+++ b/src/terminal/SshSetupHandler.cpp
@@ -27,7 +27,8 @@ string genCommand(const string& passkey, const string& id,
 
 string SshSetupHandler::SetupSsh(const string& user, const string& host,
                                  const string& host_alias, int port,
-                                 const string& jumphost, const string& jServerFifo, bool kill,
+                                 const string& jumphost,
+                                 const string& jServerFifo, bool kill,
                                  int vlevel, const string& cmd_prefix,
                                  const string& serverFifo,
                                  const std::vector<std::string>& ssh_options) {
@@ -73,7 +74,7 @@ string SshSetupHandler::SetupSsh(const string& user, const string& host,
   ssh_args.push_back(SSH_SCRIPT_DST);
 
   std::string ssh_concat;
-  for (const auto &piece : ssh_args) ssh_concat += piece + " ";
+  for (const auto& piece : ssh_args) ssh_concat += piece + " ";
   VLOG(1) << "Trying ssh with args: " << ssh_concat << endl;
   auto sshBuffer = SubprocessToStringInteractive("ssh", ssh_args);
 
@@ -115,7 +116,7 @@ string SshSetupHandler::SetupSsh(const string& user, const string& host,
       jump_cmdoptions += " --serverfifo=" + jServerFifo;
     }
     jump_cmdoptions = jump_cmdoptions + " --jump --dsthost=" + host +
-                             " --dstport=" + to_string(port);
+                      " --dstport=" + to_string(port);
     string SSH_SCRIPT_JUMP = genCommand(passkey, id, clientTerm, user, kill,
                                         cmd_prefix, jump_cmdoptions);
 
diff --git a/src/terminal/SshSetupHandler.hpp b/src/terminal/SshSetupHandler.hpp
index e8c5f6b84..279bee9b6 100644
--- a/src/terminal/SshSetupHandler.hpp
+++ b/src/terminal/SshSetupHandler.hpp
@@ -8,9 +8,8 @@ class SshSetupHandler {
  public:
   static string SetupSsh(const string &user, const string &host,
                          const string &host_alias, int port,
-                         const string &jumphost,
-                         const string& jServerFifo, bool kill,
-                         int vlevel, const string &etterminal_path,
+                         const string &jumphost, const string &jServerFifo,
+                         bool kill, int vlevel, const string &etterminal_path,
                          const string &serverFifo,
                          const std::vector<std::string> &ssh_options);
   static const string ETTERMINAL_BIN;
diff --git a/src/terminal/TerminalClientMain.cpp b/src/terminal/TerminalClientMain.cpp
index 472b9ff2f..a6c5a4304 100644
--- a/src/terminal/TerminalClientMain.cpp
+++ b/src/terminal/TerminalClientMain.cpp
@@ -82,7 +82,8 @@ int main(int argc, char** argv) {
          cxxopts::value<std::string>())  //
         ("jport", "Jumphost machine port",
          cxxopts::value<int>()->default_value("2022"))  //
-        ("jserverfifo", "If set, communicate to jumphost on the matching fifo name",
+        ("jserverfifo",
+         "If set, communicate to jumphost on the matching fifo name",
          cxxopts::value<string>()->default_value(""))  //
         ("x,kill-other-sessions",
          "kill all old sessions belonging to the user")  //
@@ -317,9 +318,9 @@ int main(int argc, char** argv) {
       etterminal_path = result["terminal-path"].as<string>();
     }
     string idpasskeypair = SshSetupHandler::SetupSsh(
-        username, destinationHost, host_alias, destinationPort, jumphost, jServerFifo,
-        result.count("x") > 0, result["verbose"].as<int>(), etterminal_path,
-        serverFifo, ssh_options);
+        username, destinationHost, host_alias, destinationPort, jumphost,
+        jServerFifo, result.count("x") > 0, result["verbose"].as<int>(),
+        etterminal_path, serverFifo, ssh_options);
 
     string id = "", passkey = "";
     // Trim whitespace
diff --git a/test/ConnectionTest.cpp b/test/ConnectionTest.cpp
index 960920598..3319a7621 100644
--- a/test/ConnectionTest.cpp
+++ b/test/ConnectionTest.cpp
@@ -140,8 +140,8 @@ class TestServerConnection : public ServerConnection {
  public:
   TestServerConnection(shared_ptr<SocketHandler> _socketHandler,
                        SocketEndpoint socketEndpoint)
-      : ServerConnection(_socketHandler, socketEndpoint){};
-  virtual ~TestServerConnection(){};
+      : ServerConnection(_socketHandler, socketEndpoint) {};
+  virtual ~TestServerConnection() {};
   virtual bool newClient(
       shared_ptr<ServerClientConnection> _serverClientState) {
     string clientId = _serverClientState->getId();
diff --git a/test/FakeConsole.hpp b/test/FakeConsole.hpp
index 6a2323974..f85679c48 100644
--- a/test/FakeConsole.hpp
+++ b/test/FakeConsole.hpp
@@ -158,7 +158,7 @@ class FakeUserTerminal : public UserTerminal {
     return getFd();
   };
 
-  virtual void runTerminal(){
+  virtual void runTerminal() {
 
   };