diff --git a/fsw/src/sc_app.c b/fsw/src/sc_app.c
index d03dba4..e07c47e 100644
--- a/fsw/src/sc_app.c
+++ b/fsw/src/sc_app.c
@@ -174,7 +174,7 @@ int32 SC_AppInit(void)
     if (Result != CFE_SUCCESS)
     {
         CFE_ES_WriteToSysLog("Event Services Register returned: 0x%08X\n", (unsigned int)Result);
-        return (Result);
+        return Result;
     }
 
     /* Must be able to create Software Bus message pipe */
@@ -183,7 +183,7 @@ int32 SC_AppInit(void)
     {
         CFE_EVS_SendEvent(SC_INIT_SB_CREATE_ERR_EID, CFE_EVS_EventType_ERROR,
                           "Software Bus Create Pipe returned: 0x%08X", (unsigned int)Result);
-        return (Result);
+        return Result;
     }
 
     /* Must be able to subscribe to HK request command */
@@ -192,7 +192,7 @@ int32 SC_AppInit(void)
     {
         CFE_EVS_SendEvent(SC_INIT_SB_SUBSCRIBE_HK_ERR_EID, CFE_EVS_EventType_ERROR,
                           "Software Bus subscribe to housekeeping returned: 0x%08X", (unsigned int)Result);
-        return (Result);
+        return Result;
     }
 
     /* Must be able to subscribe to 1Hz wakeup command */
@@ -201,7 +201,7 @@ int32 SC_AppInit(void)
     {
         CFE_EVS_SendEvent(SC_INIT_SB_SUBSCRIBE_1HZ_ERR_EID, CFE_EVS_EventType_ERROR,
                           "Software Bus subscribe to 1 Hz cycle returned: 0x%08X", (unsigned int)Result);
-        return (Result);
+        return Result;
     }
 
     /* Must be able to subscribe to SC commands */
@@ -210,21 +210,21 @@ int32 SC_AppInit(void)
     {
         CFE_EVS_SendEvent(SC_INIT_SB_SUBSCRIBE_CMD_ERR_EID, CFE_EVS_EventType_ERROR,
                           "Software Bus subscribe to command returned: 0x%08X", (unsigned int)Result);
-        return (Result);
+        return Result;
     }
 
     /* Must be able to create and initialize tables */
     Result = SC_InitTables();
     if (Result != CFE_SUCCESS)
     {
-        return (Result);
+        return Result;
     }
 
     /* Send application startup event */
     CFE_EVS_SendEvent(SC_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, "SC Initialized. Version %d.%d.%d.%d",
                       SC_MAJOR_VERSION, SC_MINOR_VERSION, SC_REVISION, SC_MISSION_REV);
 
-    return (CFE_SUCCESS);
+    return CFE_SUCCESS;
 
 } /* end SC_AppInit() */
 
@@ -244,14 +244,14 @@ int32 SC_InitTables(void)
     Result = SC_RegisterAllTables();
     if (Result != CFE_SUCCESS)
     {
-        return (Result);
+        return Result;
     }
 
     /* Must be able to get dump only table pointers */
     Result = SC_GetDumpTablePointers();
     if (Result != CFE_SUCCESS)
     {
-        return (Result);
+        return Result;
     }
 
     /* ATP control block status table */
@@ -288,13 +288,13 @@ int32 SC_InitTables(void)
     Result = SC_GetLoadTablePointers();
     if (Result != CFE_SUCCESS)
     {
-        return (Result);
+        return Result;
     }
 
     /* Register for table update notification commands */
     SC_RegisterManageCmds();
 
-    return (CFE_SUCCESS);
+    return CFE_SUCCESS;
 
 } /* end SC_InitTables() */
 
@@ -306,21 +306,24 @@ int32 SC_InitTables(void)
 
 int32 SC_RegisterAllTables(void)
 {
+
     int32 Result;
 
     Result = SC_RegisterDumpOnlyTables();
     if (Result != CFE_SUCCESS)
     {
-        return (Result);
+
+        return Result;
     }
 
     Result = SC_RegisterLoadableTables();
     if (Result != CFE_SUCCESS)
     {
-        return (Result);
+
+        return Result;
     }
 
-    return (CFE_SUCCESS);
+    return CFE_SUCCESS;
 
 } /* end SC_RegisterAllTables() */
 
@@ -349,7 +352,7 @@ int32 SC_RegisterDumpOnlyTables(void)
         {
             CFE_EVS_SendEvent(EventID[i], CFE_EVS_EventType_ERROR, "%s table register failed, returned: 0x%08X",
                               Spec[i], (unsigned int)Result);
-            return (Result);
+            return Result;
         }
     }
 
@@ -365,11 +368,11 @@ int32 SC_RegisterDumpOnlyTables(void)
             CFE_EVS_SendEvent(SC_REGISTER_ATS_CMD_STATUS_TABLE_ERR_EID, CFE_EVS_EventType_ERROR,
                               "ATS command status table register failed for ATS %d, returned: 0x%08X", i + 1,
                               (unsigned int)Result);
-            return (Result);
+            return Result;
         }
     }
 
-    return (CFE_SUCCESS);
+    return CFE_SUCCESS;
 
 } /* end SC_RegisterDumpOnlyTables() */
 
@@ -393,6 +396,7 @@ int32 SC_RegisterLoadableTables(void)
     {
         for (j = 0; j < NumTables[i]; j++)
         {
+
             snprintf(TableName, CFE_MISSION_TBL_MAX_NAME_LENGTH, StrFormat[i], Name[i], j + 1);
             Result = CFE_TBL_Register(&TblHandlePtr[i][j], TableName, TableSize[i], TableOptions[i],
                                       TblValidationFuncPtr[i]);
@@ -402,7 +406,7 @@ int32 SC_RegisterLoadableTables(void)
                 CFE_EVS_SendEvent(EventID[i], CFE_EVS_EventType_ERROR,
                                   "Table Registration Failed for %s %d, returned: 0x%08X", Spec[i], j + 1,
                                   (unsigned int)Result);
-                return (Result);
+                return Result;
             }
         }
     }
@@ -414,10 +418,10 @@ int32 SC_RegisterLoadableTables(void)
     {
         CFE_EVS_SendEvent(SC_REGISTER_APPEND_TBL_ERR_EID, CFE_EVS_EventType_ERROR,
                           "Append ATS Table Registration Failed, returned: 0x%08X", (unsigned int)Result);
-        return (Result);
+        return Result;
     }
 
-    return (CFE_SUCCESS);
+    return CFE_SUCCESS;
 
 } /* end SC_RegisterLoadableTables() */
 
@@ -441,12 +445,13 @@ int32 SC_GetDumpTablePointers(void)
 
     for (i = 0; i < 4; i++)
     {
+
         Result = CFE_TBL_GetAddress(TblAddr[i], TblHandle[i]);
         if (Result != CFE_SUCCESS)
         {
             CFE_EVS_SendEvent(EventID[i], CFE_EVS_EventType_ERROR, "Table failed Getting Address, returned: 0x%08X",
                               (unsigned int)Result);
-            return (Result);
+            return Result;
         }
     }
 
@@ -459,11 +464,11 @@ int32 SC_GetDumpTablePointers(void)
             CFE_EVS_SendEvent(SC_GET_ADDRESS_ATS_CMD_STAT_ERR_EID, CFE_EVS_EventType_ERROR,
                               "ATS Cmd Status table for ATS %d failed Getting Address, returned: 0x%08X", i + 1,
                               (unsigned int)Result);
-            return (Result);
+            return Result;
         }
     }
 
-    return (CFE_SUCCESS);
+    return CFE_SUCCESS;
 
 } /* end SC_GetDumpTablePointers() */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -486,7 +491,7 @@ int32 SC_GetLoadTablePointers(void)
         {
             CFE_EVS_SendEvent(SC_GET_ADDRESS_ATS_ERR_EID, CFE_EVS_EventType_ERROR,
                               "ATS table %d failed Getting Address, returned: 0x%08X", i + 1, (unsigned int)Result);
-            return (Result);
+            return Result;
         }
     }
 
@@ -497,7 +502,7 @@ int32 SC_GetLoadTablePointers(void)
     {
         CFE_EVS_SendEvent(SC_GET_ADDRESS_APPEND_ERR_EID, CFE_EVS_EventType_ERROR,
                           "Append ATS table failed Getting Address, returned: 0x%08X", (unsigned int)Result);
-        return (Result);
+        return Result;
     }
 
     /* Get buffer address for loadable RTS tables */
@@ -509,7 +514,7 @@ int32 SC_GetLoadTablePointers(void)
         {
             CFE_EVS_SendEvent(SC_GET_ADDRESS_RTS_ERR_EID, CFE_EVS_EventType_ERROR,
                               "RTS table %d failed Getting Address, returned: 0x%08X", i + 1, (unsigned int)Result);
-            return (Result);
+            return Result;
         }
 
         /* Process new RTS table data */
@@ -519,7 +524,7 @@ int32 SC_GetLoadTablePointers(void)
         }
     }
 
-    return (CFE_SUCCESS);
+    return CFE_SUCCESS;
 
 } /* end SC_GetLoadTablePointers() */
 
diff --git a/fsw/src/sc_atsrq.c b/fsw/src/sc_atsrq.c
index ec7e1a3..ad13bf6 100644
--- a/fsw/src/sc_atsrq.c
+++ b/fsw/src/sc_atsrq.c
@@ -270,7 +270,7 @@ bool SC_BeginAts(uint16 AtsIndex, uint16 TimeOffset)
 
     } /* end if */
 
-    return (ReturnCode);
+    return ReturnCode;
 
 } /* end SC_BeginAts */
 
@@ -496,7 +496,7 @@ bool SC_InlineSwitch(void)
     /* clear out the global ground-switch pend flag */
     SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag = false;
 
-    return (ReturnCode);
+    return ReturnCode;
 
 } /* end function */
 
diff --git a/fsw/src/sc_loads.c b/fsw/src/sc_loads.c
index e1b2ace..c23ecae 100644
--- a/fsw/src/sc_loads.c
+++ b/fsw/src/sc_loads.c
@@ -374,7 +374,7 @@ int32 SC_ValidateAts(void *TableData)
     /* Common ATS table verify function needs size of this table */
     Result = SC_VerifyAtsTable((uint32 *)TableData, SC_ATS_BUFF_SIZE32);
 
-    return (Result);
+    return Result;
 
 } /* end SC_ValidateAts */
 
@@ -487,7 +487,7 @@ bool SC_ParseRts(uint32 Buffer32[])
      */
 
     /* If Error was true   , then SC_ParseRts must return false    */
-    return (!Error);
+    return !Error;
 
 } /* end SC_ParseRts */
 
@@ -514,7 +514,7 @@ int32 SC_ValidateRts(void *TableData)
         Result = SC_ERROR;
     }
 
-    return (Result);
+    return Result;
 
 } /* end SC_ValidateRts */
 
@@ -530,7 +530,7 @@ int32 SC_ValidateAppend(void *TableData)
     /* Common ATS table verify function needs size of this table */
     Result = SC_VerifyAtsTable((uint32 *)TableData, SC_APPEND_BUFF_SIZE32);
 
-    return (Result);
+    return Result;
 
 } /* end SC_ValidateAppend */
 
@@ -741,7 +741,7 @@ int32 SC_VerifyAtsTable(uint32 *Buffer32, int32 BufferWords)
         }
     }
 
-    return (Result);
+    return Result;
 
 } /* end SC_VerifyAtsTable */
 
@@ -850,7 +850,7 @@ int32 SC_VerifyAtsEntry(uint32 *Buffer32, int32 EntryIndex, int32 BufferWords)
         }
     }
 
-    return (Result);
+    return Result;
 
 } /* End of SC_VerifyAtsEntry */
 
diff --git a/fsw/src/sc_utils.c b/fsw/src/sc_utils.c
index cc212c6..fed8857 100644
--- a/fsw/src/sc_utils.c
+++ b/fsw/src/sc_utils.c
@@ -109,7 +109,7 @@ SC_AbsTimeTag_t SC_ComputeAbsTime(SC_RelTimeTag_t RelTime)
     ResultTimeWSubs = CFE_TIME_Add(AbsoluteTimeWSubs, RelTimeWSubs);
 
     /* We don't need subseconds */
-    return (ResultTimeWSubs.Seconds);
+    return ResultTimeWSubs.Seconds;
 
 } /* end of SC_ComputeAbsTime */
 
@@ -176,7 +176,7 @@ bool SC_VerifyCmdLength(const CFE_MSG_Message_t *Msg, size_t ExpectedLength)
             SC_OperData.HkPacket.CmdErrCtr++;
         }
     }
-    return (Result);
+    return Result;
 } /* End of SC_VerifyCmdLength */
 
 uint16 SC_ToggleAtsIndex(void)