diff --git a/examples/js-sub.c b/examples/js-sub.c
index 6ac3e7ff..f5bfe4cb 100644
--- a/examples/js-sub.c
+++ b/examples/js-sub.c
@@ -188,7 +188,7 @@ int main(int argc, char **argv)
             // Uncomment to provide custom control over next fetch size.
             // jsOpts.PullSubscribeAsync.NextHandler = nextFetchCb;
 
-            // Uncomment to turn off AutoACK on delivered messages.            
+            // Uncomment to turn off AutoACK on delivered messages.
             // so.ManualAck = true;
 
             s = js_PullSubscribeAsync(&sub, js, subj, durable, onMsg, NULL, &jsOpts, &so, &jerr);
diff --git a/src/dispatch.c b/src/dispatch.c
index bf9f8c0f..1571d509 100644
--- a/src/dispatch.c
+++ b/src/dispatch.c
@@ -477,7 +477,7 @@ nats_dispatchThreadOwn(void *arg)
         completeCBClosure = sub->onCompleteCBClosure;
         jsSub *jsi = sub->jsi;
         connClosed = sub->connClosed;
-        
+
         fetch = (jsi != NULL) ? jsi->fetch : NULL;
         if (sub->closed)
         {
@@ -560,7 +560,7 @@ nats_dispatchThreadOwn(void *arg)
             unsub = true;
             break;
         }
-        if (lastMessageInSub) 
+        if (lastMessageInSub)
         {
             // If we have hit the max for delivered msgs, just remove sub.
             rmSub = true;
diff --git a/src/js.c b/src/js.c
index dd0d5c4c..08dc2e26 100644
--- a/src/js.c
+++ b/src/js.c
@@ -3018,7 +3018,7 @@ js_PullSubscribeAsync(natsSubscription **newsub, jsCtx *js, const char *subject,
         if (jsOpts->PullSubscribeAsync.NoWait)
             return nats_setError(NATS_INVALID_ARG, "%s", "Can not use NoWait with KeepAhead together");
     }
-    
+
     if (errCode != NULL)
         *errCode = 0;
 
diff --git a/src/jsm.c b/src/jsm.c
index 355733c0..10c2bfe9 100644
--- a/src/jsm.c
+++ b/src/jsm.c
@@ -691,7 +691,7 @@ js_unmarshalStreamConfig(nats_JSON *json, const char *fieldName, jsStreamConfig
     jsStreamConfig      *cfg        = NULL;
     nats_JSON           **sources   = NULL;
     int                 sourcesLen  = 0;
-    nats_JSON           *obj        = NULL; 
+    nats_JSON           *obj        = NULL;
     natsStatus          s;
 
     if (fieldName != NULL)
diff --git a/src/nats.c b/src/nats.c
index dda51cd8..fa592d36 100644
--- a/src/nats.c
+++ b/src/nats.c
@@ -95,7 +95,7 @@ natsStatus
 nats_Open(int64_t lockSpinCount)
 {
     bool defaultToSharedDispatchers = (getenv("NATS_DEFAULT_TO_LIB_MSG_DELIVERY") != NULL ? true : false);
-    
+
     natsClientConfig config = {
         .LockSpinCount = lockSpinCount,
         .DefaultToThreadPool = defaultToSharedDispatchers,
diff --git a/src/sub.c b/src/sub.c
index 925c27a1..85157742 100644
--- a/src/sub.c
+++ b/src/sub.c
@@ -395,7 +395,7 @@ natsSub_create(natsSubscription **newSub, natsConnection *nc, const char *subj,
     {
         _retain(sub);
         if (!useAsyncThread)
-        {            
+        {
             sub->dispatcher = &sub->ownDispatcher;
             _release(sub);
         }
diff --git a/src/util.c b/src/util.c
index c93fe6a1..4fcfb090 100644
--- a/src/util.c
+++ b/src/util.c
@@ -2609,7 +2609,7 @@ natsStatus nats_formatStringArray(char **out, const char **strings, int count)
 
     IFOK(s, natsBuf_AppendByte(&buf, ']'));
     IFOK(s, natsBuf_AppendByte(&buf, '\0'));
-    
+
     if (s != NATS_OK)
     {
         natsBuf_Cleanup(&buf);
diff --git a/src/version.h b/src/version.h
index eb26d6fc..c1587469 100644
--- a/src/version.h
+++ b/src/version.h
@@ -26,11 +26,11 @@ extern "C" {
 #define NATS_VERSION_PATCH  0
 
 #define NATS_VERSION_STRING "3.10.0-beta"
-			 				  
+
 #define NATS_VERSION_NUMBER ((NATS_VERSION_MAJOR << 16) | \
                              (NATS_VERSION_MINOR <<  8) | \
                              NATS_VERSION_PATCH)
-                             
+
 #define NATS_VERSION_REQUIRED_NUMBER 0x030900
 
 #ifdef __cplusplus
diff --git a/src/version.h.in b/src/version.h.in
index 786cfca6..12ae3c23 100644
--- a/src/version.h.in
+++ b/src/version.h.in
@@ -26,11 +26,11 @@ extern "C" {
 #define NATS_VERSION_PATCH  @NATS_VERSION_PATCH@
 
 #define NATS_VERSION_STRING "@NATS_VERSION_MAJOR@.@NATS_VERSION_MINOR@.@NATS_VERSION_PATCH@@NATS_VERSION_SUFFIX@"
-			 				  
+
 #define NATS_VERSION_NUMBER ((NATS_VERSION_MAJOR << 16) | \
                              (NATS_VERSION_MINOR <<  8) | \
                              NATS_VERSION_PATCH)
-                             
+
 #define NATS_VERSION_REQUIRED_NUMBER @NATS_VERSION_REQUIRED_NUMBER@
 
 #ifdef __cplusplus