diff --git a/src/modbus.c b/src/modbus.c
index 81322481..5a9b8678 100644
--- a/src/modbus.c
+++ b/src/modbus.c
@@ -220,7 +220,10 @@ static int send_msg(modbus_t *ctx, uint8_t *msg, int msg_length)
     return rc;
 }
 
-int modbus_send_raw_request_tid(modbus_t *ctx, const uint8_t *raw_req, int raw_req_length, int tid)
+int modbus_send_raw_request_tid(modbus_t *ctx,
+                                const uint8_t *raw_req,
+                                int raw_req_length,
+                                int tid)
 {
     sft_t sft;
     uint8_t req[MAX_MESSAGE_LENGTH];
diff --git a/src/modbus.h b/src/modbus.h
index c0d87821..9b1ef6b7 100644
--- a/src/modbus.h
+++ b/src/modbus.h
@@ -257,8 +257,10 @@ MODBUS_API void modbus_mapping_free(modbus_mapping_t *mb_mapping);
 MODBUS_API int
 modbus_send_raw_request(modbus_t *ctx, const uint8_t *raw_req, int raw_req_length);
 
-MODBUS_API int
-modbus_send_raw_request_tid(modbus_t *ctx, const uint8_t *raw_req, int raw_req_length, int tid);
+MODBUS_API int modbus_send_raw_request_tid(modbus_t *ctx,
+                                           const uint8_t *raw_req,
+                                           int raw_req_length,
+                                           int tid);
 
 MODBUS_API int modbus_receive(modbus_t *ctx, uint8_t *req);
 
@@ -278,31 +280,31 @@ MODBUS_API int modbus_disable_quirks(modbus_t *ctx, unsigned int quirks_mask);
  **/
 
 #define MODBUS_GET_HIGH_BYTE(data) (((data) >> 8) & 0xFF)
-#define MODBUS_GET_LOW_BYTE(data)  ((data) &0xFF)
-#define MODBUS_GET_INT64_FROM_INT16(tab_int16, index)                                \
-  (((int64_t) tab_int16[(index)] << 48) | ((int64_t) tab_int16[(index) + 1] << 32) | \
-   ((int64_t) tab_int16[(index) + 2] << 16) | (int64_t) tab_int16[(index) + 3])
+#define MODBUS_GET_LOW_BYTE(data)  ((data) & 0xFF)
+#define MODBUS_GET_INT64_FROM_INT16(tab_int16, index)                                  \
+    (((int64_t) tab_int16[(index)] << 48) | ((int64_t) tab_int16[(index) + 1] << 32) | \
+     ((int64_t) tab_int16[(index) + 2] << 16) | (int64_t) tab_int16[(index) + 3])
 #define MODBUS_GET_INT32_FROM_INT16(tab_int16, index) \
-  (((int32_t) tab_int16[(index)] << 16) | (int32_t) tab_int16[(index) + 1])
+    (((int32_t) tab_int16[(index)] << 16) | (int32_t) tab_int16[(index) + 1])
 #define MODBUS_GET_INT16_FROM_INT8(tab_int8, index) \
-  (((int16_t) tab_int8[(index)] << 8) | (int16_t) tab_int8[(index) + 1])
-#define MODBUS_SET_INT16_TO_INT8(tab_int8, index, value)        \
-  do {                                                          \
-    ((int8_t *) (tab_int8))[(index)] = (int8_t) ((value) >> 8); \
-    ((int8_t *) (tab_int8))[(index) + 1] = (int8_t) (value);    \
-  } while (0)
-#define MODBUS_SET_INT32_TO_INT16(tab_int16, index, value)          \
-  do {                                                              \
-    ((int16_t *) (tab_int16))[(index)] = (int16_t) ((value) >> 16); \
-    ((int16_t *) (tab_int16))[(index) + 1] = (int16_t) (value);     \
-  } while (0)
-#define MODBUS_SET_INT64_TO_INT16(tab_int16, index, value)              \
-  do {                                                                  \
-    ((int16_t *) (tab_int16))[(index)] = (int16_t) ((value) >> 48);     \
-    ((int16_t *) (tab_int16))[(index) + 1] = (int16_t) ((value) >> 32); \
-    ((int16_t *) (tab_int16))[(index) + 2] = (int16_t) ((value) >> 16); \
-    ((int16_t *) (tab_int16))[(index) + 3] = (int16_t) (value);         \
-  } while (0)
+    (((int16_t) tab_int8[(index)] << 8) | (int16_t) tab_int8[(index) + 1])
+#define MODBUS_SET_INT16_TO_INT8(tab_int8, index, value)            \
+    do {                                                            \
+        ((int8_t *) (tab_int8))[(index)] = (int8_t) ((value) >> 8); \
+        ((int8_t *) (tab_int8))[(index) + 1] = (int8_t) (value);    \
+    } while (0)
+#define MODBUS_SET_INT32_TO_INT16(tab_int16, index, value)              \
+    do {                                                                \
+        ((int16_t *) (tab_int16))[(index)] = (int16_t) ((value) >> 16); \
+        ((int16_t *) (tab_int16))[(index) + 1] = (int16_t) (value);     \
+    } while (0)
+#define MODBUS_SET_INT64_TO_INT16(tab_int16, index, value)                  \
+    do {                                                                    \
+        ((int16_t *) (tab_int16))[(index)] = (int16_t) ((value) >> 48);     \
+        ((int16_t *) (tab_int16))[(index) + 1] = (int16_t) ((value) >> 32); \
+        ((int16_t *) (tab_int16))[(index) + 2] = (int16_t) ((value) >> 16); \
+        ((int16_t *) (tab_int16))[(index) + 3] = (int16_t) (value);         \
+    } while (0)
 
 MODBUS_API void modbus_set_bits_from_byte(uint8_t *dest, int idx, const uint8_t value);
 MODBUS_API void modbus_set_bits_from_bytes(uint8_t *dest,