diff --git a/src/kakounecli.cpp b/src/kakounecli.cpp
index e6b7c9d..d8b981d 100644
--- a/src/kakounecli.cpp
+++ b/src/kakounecli.cpp
@@ -4,11 +4,12 @@
 KakouneCli::KakouneCli()
 {
     QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-    QString session_id = env.value("KAKQT_SESSION_ID") ;
+    QString session_id = env.value("KAKQT_SESSION_ID");
 
     m_socket = new QLocalSocket();
     m_socket->connectToServer("KakouneQt." + session_id);
-    if (!m_socket->waitForConnected()) {
+    if (!m_socket->waitForConnected())
+    {
         qDebug() << "Failed to connect to server:" << m_socket->errorString();
         return;
     }
@@ -16,7 +17,7 @@ KakouneCli::KakouneCli()
 
 KakouneCli::~KakouneCli()
 {
-  m_socket->disconnectFromServer();
+    m_socket->disconnectFromServer();
 }
 
 int KakouneCli::run(QStringList command)
diff --git a/src/kakounecli.hpp b/src/kakounecli.hpp
index 508bee1..eeda000 100644
--- a/src/kakounecli.hpp
+++ b/src/kakounecli.hpp
@@ -2,8 +2,8 @@
 #define KAKOUNECLI_HPP
 
 #include <QList>
-#include <QString>
 #include <QLocalSocket>
+#include <QString>
 
 class KakouneCli
 {
diff --git a/src/kakouneserver.cpp b/src/kakouneserver.cpp
index 2f92a37..7d3f1f6 100644
--- a/src/kakouneserver.cpp
+++ b/src/kakouneserver.cpp
@@ -1,17 +1,17 @@
 #include "kakouneserver.hpp"
-#include <QLocalSocket>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QLocalSocket>
 
-KakouneServer::KakouneServer(const QString& session_id)
+KakouneServer::KakouneServer(const QString &session_id)
 {
     m_server = new QLocalServer(this);
 
     if (!m_server->listen(session_id))
     {
-      qDebug() << "Unable to start the server: " << m_server->errorString();
-      m_server->close();
-      return;
+        qDebug() << "Unable to start the server: " << m_server->errorString();
+        m_server->close();
+        return;
     }
 
     connect(m_server, &QLocalServer::newConnection, this, &KakouneServer::handleConnection);
@@ -24,20 +24,20 @@ KakouneServer::~KakouneServer()
     delete m_server;
 }
 
-void KakouneServer::bind(MainWindow* main_window)
+void KakouneServer::bind(MainWindow *main_window)
 {
     connect(this, &KakouneServer::newClient, main_window, &MainWindow::newClient);
-    connect(this, &KakouneServer::focusWindow , main_window, &MainWindow::focusWindow);
+    connect(this, &KakouneServer::focusWindow, main_window, &MainWindow::focusWindow);
 }
 
 void KakouneServer::handleConnection()
 {
     QLocalSocket *client_socket = m_server->nextPendingConnection();
 
-    connect(client_socket, &QLocalSocket::disconnected,
-            client_socket, &QLocalSocket::deleteLater);
+    connect(client_socket, &QLocalSocket::disconnected, client_socket, &QLocalSocket::deleteLater);
 
-    if (client_socket->waitForReadyRead()) {
+    if (client_socket->waitForReadyRead())
+    {
         QByteArray request = client_socket->readAll();
         QJsonObject request_json = QJsonDocument::fromJson(request).object();
 
@@ -51,10 +51,13 @@ void KakouneServer::handleCommand(QJsonObject request)
 {
     const QString method = request["method"].toString();
     qDebug() << method;
-    if (method == "newClient") {
-      emit newClient(request["args"].isString() ? request["args"].toString() : "");
-    }else if (method == "focusWindow") {
-      qDebug() << request["client_name"].toString();
-      emit focusWindow(request["client_name"].toString());
+    if (method == "newClient")
+    {
+        emit newClient(request["args"].isString() ? request["args"].toString() : "");
+    }
+    else if (method == "focusWindow")
+    {
+        qDebug() << request["client_name"].toString();
+        emit focusWindow(request["client_name"].toString());
     }
 }
diff --git a/src/kakouneserver.hpp b/src/kakouneserver.hpp
index 12db1ba..62544eb 100644
--- a/src/kakouneserver.hpp
+++ b/src/kakouneserver.hpp
@@ -2,26 +2,27 @@
 #define KAKOUNESERVER_HPP
 
 #include "mainwindow.hpp"
-#include <QObject>
 #include <QLocalServer>
+#include <QObject>
 
 class KakouneServer : public QObject
 {
-  Q_OBJECT
+    Q_OBJECT
   public:
-    KakouneServer(const QString& session_id);
+    KakouneServer(const QString &session_id);
     ~KakouneServer();
 
-    void bind(MainWindow* main_window);
+    void bind(MainWindow *main_window);
   signals:
-    void newClient(const QString& arguments);
-    void focusWindow(const QString& client_name);
+    void newClient(const QString &arguments);
+    void focusWindow(const QString &client_name);
+
   protected:
     void handleConnection();
     void handleCommand(QJsonObject request);
+
   private:
     QLocalServer *m_server;
-
 };
 
 #endif
diff --git a/src/kakounewidget.cpp b/src/kakounewidget.cpp
index f5b085f..7e860a4 100644
--- a/src/kakounewidget.cpp
+++ b/src/kakounewidget.cpp
@@ -13,7 +13,8 @@ KakouneWidget::KakouneWidget(const QString &session_id, DrawOptions *draw_option
     m_id = QUuid::createUuid();
     m_draw_options = draw_options;
 
-    m_client = new KakouneClient(session_id, client_arguments, {{"KAKQT_SESSION_ID", session_id}, {"KAKQT_WINDOW_ID", m_id.toString()}});
+    m_client = new KakouneClient(session_id, client_arguments,
+                                 {{"KAKQT_SESSION_ID", session_id}, {"KAKQT_WINDOW_ID", m_id.toString()}});
     connect(m_client, &KakouneClient::refresh, this, &KakouneWidget::clientRefreshed);
     connect(m_client, &KakouneClient::finished, this, &KakouneWidget::finished);
     connect(m_client, &KakouneClient::setUIOptions, this, &KakouneWidget::setUIOptions);