diff --git a/fsw/src/sample_lib.c b/fsw/src/sample_lib.c
index 0b45272..0f12f1b 100644
--- a/fsw/src/sample_lib.c
+++ b/fsw/src/sample_lib.c
@@ -64,8 +64,7 @@ int32 SAMPLE_LIB_Init(void)
     OS_printf("SAMPLE Lib Initialized.%s\n", SAMPLE_LIB_VERSION_STRING);
 
     return CFE_SUCCESS;
-
-} /* End SAMPLE_LIB_Init */
+}
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /*                                                                 */
@@ -77,9 +76,4 @@ int32 SAMPLE_LIB_Function(void)
     OS_printf("SAMPLE_LIB_Function called, buffer=\'%s\'\n", SAMPLE_LIB_Buffer);
 
     return CFE_SUCCESS;
-
-} /* End SAMPLE_LIB_Function */
-
-/************************/
-/*  End of File Comment */
-/************************/
+}
\ No newline at end of file
diff --git a/unit-test/inc/OCS_string.h b/unit-test/inc/OCS_string.h
index f9766a5..3324ccf 100644
--- a/unit-test/inc/OCS_string.h
+++ b/unit-test/inc/OCS_string.h
@@ -32,7 +32,7 @@
 #define OSC_STRING_H
 
 /* ----------------------------------------- */
-/* prototypes normally declared in string.h */
+/* prototypes normally declared in string.h  */
 /* ----------------------------------------- */
 
 extern char *OCS_strncpy(char *dest, const char *src, unsigned long size);
diff --git a/unit-test/override_inc/string.h b/unit-test/override_inc/string.h
index 1c62645..64c1607 100644
--- a/unit-test/override_inc/string.h
+++ b/unit-test/override_inc/string.h
@@ -34,7 +34,7 @@
 #include "OCS_string.h"
 
 /* ----------------------------------------- */
-/* mappings for declarations in string.h */
+/* mappings for declarations in string.h     */
 /* ----------------------------------------- */
 
 #define strncpy OCS_strncpy
diff --git a/ut-stubs/sample_lib_stubs.c b/ut-stubs/sample_lib_stubs.c
index c245342..72f63a9 100644
--- a/ut-stubs/sample_lib_stubs.c
+++ b/ut-stubs/sample_lib_stubs.c
@@ -61,8 +61,7 @@ int32 SAMPLE_LIB_Init(void)
      * case configures something different.
      */
     return UT_DEFAULT_IMPL(SAMPLE_LIB_Init);
-
-} /* End SAMPLE_LIB_Init */
+}
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /*                                                                 */
@@ -72,4 +71,4 @@ int32 SAMPLE_LIB_Init(void)
 int32 SAMPLE_LIB_Function(void)
 {
     return UT_DEFAULT_IMPL(SAMPLE_LIB_Function);
-} /* End SAMPLE_LIB_Function */
+}