diff --git a/src/WebSockets.h b/src/WebSockets.h
index 00d65b2..aded4bb 100644
--- a/src/WebSockets.h
+++ b/src/WebSockets.h
@@ -259,15 +259,13 @@ typedef struct {
 } WSMessageHeader_t;
 
 typedef struct {
-
-    void init (uint8_t  num,
-               uint32_t pingInterval,
-               uint32_t pongTimeout,
-               uint8_t  disconnectTimeoutCount)
-    {
-        this->num = num;
-        this->pingInterval = pingInterval;
-        this->pongTimeout = pongTimeout;
+    void init(uint8_t num,
+        uint32_t pingInterval,
+        uint32_t pongTimeout,
+        uint8_t disconnectTimeoutCount) {
+        this->num                    = num;
+        this->pingInterval           = pingInterval;
+        this->pongTimeout            = pongTimeout;
         this->disconnectTimeoutCount = disconnectTimeoutCount;
     }
 
@@ -284,19 +282,19 @@ typedef struct {
     WEBSOCKETS_NETWORK_SSL_CLASS * ssl;
 #endif
 
-    String cUrl;        ///< http url
-    uint16_t cCode = 0; ///< http code
+    String cUrl;           ///< http url
+    uint16_t cCode = 0;    ///< http code
 
-    bool cIsClient = false;    ///< will be used for masking
-    bool cIsUpgrade = false;   ///< Connection == Upgrade
-    bool cIsWebsocket = false; ///< Upgrade == websocket
+    bool cIsClient    = false;    ///< will be used for masking
+    bool cIsUpgrade   = false;    ///< Connection == Upgrade
+    bool cIsWebsocket = false;    ///< Upgrade == websocket
 
-    String cSessionId;     ///< client Set-Cookie (session id)
-    String cKey;           ///< client Sec-WebSocket-Key
-    String cAccept;        ///< client Sec-WebSocket-Accept
-    String cProtocol;      ///< client Sec-WebSocket-Protocol
-    String cExtensions;    ///< client Sec-WebSocket-Extensions
-    uint16_t cVersion = 0; ///< client Sec-WebSocket-Version
+    String cSessionId;        ///< client Set-Cookie (session id)
+    String cKey;              ///< client Sec-WebSocket-Key
+    String cAccept;           ///< client Sec-WebSocket-Accept
+    String cProtocol;         ///< client Sec-WebSocket-Protocol
+    String cExtensions;       ///< client Sec-WebSocket-Extensions
+    uint16_t cVersion = 0;    ///< client Sec-WebSocket-Version
 
     uint8_t cWsRXsize = 0;                            ///< State of the RX
     uint8_t cWsHeader[WEBSOCKETS_MAX_HEADER_SIZE];    ///< RX WS Message buffer
@@ -307,15 +305,15 @@ typedef struct {
 
     String extraHeaders;
 
-    bool cHttpHeadersValid = false;   ///< non-websocket http header validity indicator
-    size_t cMandatoryHeadersCount;    ///< non-websocket mandatory http headers present count
+    bool cHttpHeadersValid = false;    ///< non-websocket http header validity indicator
+    size_t cMandatoryHeadersCount;     ///< non-websocket mandatory http headers present count
 
-    bool pongReceived = false;
-    uint32_t pingInterval = 0;          // how often ping will be sent, 0 means "heartbeat is not active"
-    uint32_t lastPing = 0;              // millis when last pong has been received
-    uint32_t pongTimeout = 0;           // interval in millis after which pong is considered to timeout
-    uint8_t disconnectTimeoutCount = 0; // after how many subsequent pong timeouts discconnect will happen, 0 means "do not disconnect"
-    uint8_t pongTimeoutCount = 0;       // current pong timeout count
+    bool pongReceived              = false;
+    uint32_t pingInterval          = 0;    // how often ping will be sent, 0 means "heartbeat is not active"
+    uint32_t lastPing              = 0;    // millis when last pong has been received
+    uint32_t pongTimeout           = 0;    // interval in millis after which pong is considered to timeout
+    uint8_t disconnectTimeoutCount = 0;    // after how many subsequent pong timeouts discconnect will happen, 0 means "do not disconnect"
+    uint8_t pongTimeoutCount       = 0;    // current pong timeout count
 
 #if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
     String cHttpLine;    ///< HTTP header lines
diff --git a/src/WebSocketsServer.cpp b/src/WebSocketsServer.cpp
index c8ac2ef..b1d575a 100644
--- a/src/WebSocketsServer.cpp
+++ b/src/WebSocketsServer.cpp
@@ -71,13 +71,12 @@ WebSocketsServer::~WebSocketsServer() {
  * called to initialize the Websocket server
  */
 void WebSocketsServerCore::begin(void) {
-
     // adjust clients storage:
     // _clients[i]'s constructor are already called,
     // all its members are initialized to their default value,
     // except the ones explicitly detailed in WSclient_t() constructor.
     // Then we need to initialize some members to non-trivial values:
-    for (int i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
+    for(int i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
         _clients[i].init(i, _pingInterval, _pongTimeout, _disconnectTimeoutCount);
     }
 
@@ -100,7 +99,7 @@ void WebSocketsServerCore::close(void) {
 
     // restore _clients[] to their initial state
     // before next call to ::begin()
-    for (int i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
+    for(int i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
         _clients[i] = WSclient_t();
     }
 }