diff --git a/src/goose/goose_receiver.c b/src/goose/goose_receiver.c
index 1d617516..6e4387a6 100644
--- a/src/goose/goose_receiver.c
+++ b/src/goose/goose_receiver.c
@@ -856,7 +856,7 @@ parseGoosePayload(GooseReceiver self, uint8_t* buffer, int apduLength)
 
                 MmsValue_setUtcTime(matchingSubscriber->timestamp, 0);
             }
-            
+
             if (matchingSubscriber->isObserver && matchingSubscriber->dataSetValues != NULL) {
                 MmsValue_delete(matchingSubscriber->dataSetValues);
                 matchingSubscriber->dataSetValues = NULL;
@@ -934,7 +934,7 @@ parseGooseMessage(GooseReceiver self, uint8_t* buffer, int numbytes)
         return;
     if (buffer[bufPos++] != 0xb8)
         return;
-    
+
     uint8_t srcMac[6];
     memcpy(srcMac,&buffer[6],6);
 
@@ -976,7 +976,7 @@ parseGooseMessage(GooseReceiver self, uint8_t* buffer, int numbytes)
 
     while (element != NULL) {
         GooseSubscriber subscriber = (GooseSubscriber) LinkedList_getData(element);
-        
+
         if (subscriber->isObserver)
         {
             subscriber->appId = appId;
diff --git a/src/iec61850/client/ied_connection.c b/src/iec61850/client/ied_connection.c
index 693a9623..89be080a 100644
--- a/src/iec61850/client/ied_connection.c
+++ b/src/iec61850/client/ied_connection.c
@@ -652,11 +652,11 @@ IedConnection_tick(IedConnection self)
 }
 
 void
-IedConnection_setLocalAddress(IedConnection self, const char* localIpAddress, int localPort) 
+IedConnection_setLocalAddress(IedConnection self, const char* localIpAddress, int localPort)
 {
     MmsConnection connection = self->connection;
     IsoConnectionParameters isoP = MmsConnection_getIsoConnectionParameters(connection);
-      
+
     IsoConnectionParameters_setLocalTcpParameters(isoP, localIpAddress, localPort);
 }
 
@@ -4252,4 +4252,3 @@ FileDirectoryEntry_getLastModified(FileDirectoryEntry self)
 {
     return self->lastModified;
 }
-
diff --git a/src/iec61850/server/mms_mapping/control.c b/src/iec61850/server/mms_mapping/control.c
index d293fb59..caffa8f4 100644
--- a/src/iec61850/server/mms_mapping/control.c
+++ b/src/iec61850/server/mms_mapping/control.c
@@ -2550,4 +2550,3 @@ ControlAction_getControlTime(ControlAction self)
 }
 
 #endif /* (CONFIG_IEC61850_CONTROL_SERVICE == 1) */
-
diff --git a/src/iec61850/server/model/config_file_parser.c b/src/iec61850/server/model/config_file_parser.c
index 6a52788a..31d4944b 100644
--- a/src/iec61850/server/model/config_file_parser.c
+++ b/src/iec61850/server/model/config_file_parser.c
@@ -563,5 +563,3 @@ exit_error:
     IedModel_destroy(model);
     return NULL;
 }
-
-
diff --git a/src/mms/iso_mms/client/mms_client_connection.c b/src/mms/iso_mms/client/mms_client_connection.c
index 59e5611b..c3a89acc 100644
--- a/src/mms/iso_mms/client/mms_client_connection.c
+++ b/src/mms/iso_mms/client/mms_client_connection.c
@@ -1867,7 +1867,7 @@ MmsConnection_abort(MmsConnection self, MmsError* mmsError)
         }
 
     }
-    
+
     if (success == false) {
         IsoClientConnection_close(self->isoClient);
         *mmsError = MMS_ERROR_SERVICE_TIMEOUT;
diff --git a/src/mms/iso_mms/server/mms_file_service.c b/src/mms/iso_mms/server/mms_file_service.c
index 34ec3285..2ba5e2f5 100644
--- a/src/mms/iso_mms/server/mms_file_service.c
+++ b/src/mms/iso_mms/server/mms_file_service.c
@@ -436,11 +436,11 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task, int taskState)
 
     ByteBuffer* message = NULL;
 
-    if (taskState == MMS_FILE_UPLOAD_STATE_SEND_FILE_READ || 
+    if (taskState == MMS_FILE_UPLOAD_STATE_SEND_FILE_READ ||
         taskState == MMS_FILE_UPLOAD_STATE_SEND_FILE_CLOSE ||
         taskState == MMS_FILE_UPLOAD_STATE_SEND_OBTAIN_FILE_ERROR_SOURCE ||
         taskState == MMS_FILE_UPLOAD_STATE_SEND_OBTAIN_FILE_ERROR_DESTINATION ||
-        taskState == MMS_FILE_UPLOAD_STATE_SEND_OBTAIN_FILE_RESPONSE) 
+        taskState == MMS_FILE_UPLOAD_STATE_SEND_OBTAIN_FILE_RESPONSE)
     {
         IsoConnection_lock(task->connection->isoConnection);
 
@@ -551,7 +551,7 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task, int taskState)
                         FileSystem_closeFile(task->fileHandle);
                         task->fileHandle = NULL;
                     }
-                    
+
                     deleteFile(MmsServer_getFilesystemBasepath(self), task->destinationFilename);
 
                     if (DEBUG_MMS_SERVER)
@@ -1051,7 +1051,7 @@ createFileDirectoryResponse(const char* basepath, uint32_t invokeId, ByteBuffer*
             continueAfterFileName = NULL;
     }
 
-    if ((directoryName && mmsMsg_isFilenameSave(directoryName) == false) || 
+    if ((directoryName && mmsMsg_isFilenameSave(directoryName) == false) ||
         (continueAfterFileName && mmsMsg_isFilenameSave(continueAfterFileName) == false))
     {
         if (DEBUG_MMS_SERVER)
@@ -1282,4 +1282,3 @@ mmsServer_handleFileDirectoryRequest(
 }
 
 #endif /* MMS_FILE_SERVICE == 1 */
-
diff --git a/src/mms/iso_mms/server/mms_information_report.c b/src/mms/iso_mms/server/mms_information_report.c
index 5bbb3102..7d370301 100644
--- a/src/mms/iso_mms/server/mms_information_report.c
+++ b/src/mms/iso_mms/server/mms_information_report.c
@@ -331,6 +331,3 @@ MmsServerConnection_sendInformationReportVMDSpecific(MmsServerConnection self, c
 exit_function:
     return;
 }
-
-
-
diff --git a/src/mms/iso_mms/server/mms_read_service.c b/src/mms/iso_mms/server/mms_read_service.c
index e251d18f..52fe7e1d 100644
--- a/src/mms/iso_mms/server/mms_read_service.c
+++ b/src/mms/iso_mms/server/mms_read_service.c
@@ -922,8 +922,8 @@ mmsServer_handleReadRequest(
         goto exit_function;
     }
 
-    if ((mmsPdu->present == MmsPdu_PR_confirmedRequestPdu) && 
-        (mmsPdu->choice.confirmedRequestPdu.confirmedServiceRequest.present 
+    if ((mmsPdu->present == MmsPdu_PR_confirmedRequestPdu) &&
+        (mmsPdu->choice.confirmedRequestPdu.confirmedServiceRequest.present
             == ConfirmedServiceRequest_PR_read))
     {
         request = &(mmsPdu->choice.confirmedRequestPdu.confirmedServiceRequest.choice.read);
@@ -950,10 +950,10 @@ mmsServer_handleReadRequest(
     }
 #endif
     else {
-        mmsMsg_createServiceErrorPdu(invokeId, response, MMS_ERROR_ACCESS_OBJECT_ACCESS_UNSUPPORTED);   
+        mmsMsg_createServiceErrorPdu(invokeId, response, MMS_ERROR_ACCESS_OBJECT_ACCESS_UNSUPPORTED);
     }
 
-exit_function:	
+exit_function:
     asn_DEF_MmsPdu.free_struct(&asn_DEF_MmsPdu, mmsPdu, 0);
 }
 
@@ -976,4 +976,3 @@ MmsServerConnection_sendReadResponse(MmsServerConnection self, uint32_t invokeId
     if (handlerMode == false)
         IsoConnection_unlock(self->isoConnection);
 }
-
diff --git a/src/mms/iso_mms/server/mms_server_connection.c b/src/mms/iso_mms/server/mms_server_connection.c
index 0f89e21e..7ac4ce73 100644
--- a/src/mms/iso_mms/server/mms_server_connection.c
+++ b/src/mms/iso_mms/server/mms_server_connection.c
@@ -891,6 +891,3 @@ MmsServerConnection_getFilesystemBasepath(MmsServerConnection self)
     return CONFIG_VIRTUAL_FILESTORE_BASEPATH;
 #endif
 }
-
-
-
diff --git a/src/sampled_values/sv_subscriber.c b/src/sampled_values/sv_subscriber.c
index 3e209656..a343ce5b 100644
--- a/src/sampled_values/sv_subscriber.c
+++ b/src/sampled_values/sv_subscriber.c
@@ -254,7 +254,7 @@ SVReceiver_startThreadless(SVReceiver self)
 
         self->running = true;
     }
-    
+
     return self->ethSocket;
 }
 
@@ -343,7 +343,7 @@ parseASDU(SVReceiver self, SVSubscriber subscriber, uint8_t* buffer, int length)
         asdu.svId[svIdLength] = 0;
     if (asdu.datSet != NULL)
         asdu.datSet[datSetLength] = 0;
-    
+
     if (DEBUG_SV_SUBSCRIBER) {
         printf("SV_SUBSCRIBER:   SV ASDU: ----------------\n");
         printf("SV_SUBSCRIBER:     DataLength: %d\n", asdu.dataBufferLength);
@@ -1006,4 +1006,3 @@ SVClientASDU_getDataSize(SVSubscriber_ASDU self)
 {
     return SVSubscriber_ASDU_getDataSize(self);
 }
-