diff --git a/scripts/split_rendering/lc3plus_basop/ivas_lc3plus_unit_test.c b/scripts/split_rendering/lc3plus_basop/ivas_lc3plus_unit_test.c
index 7cdda5634263cb52e123897c0bf9c0215507757d..df8b7589a9511bc37785b567dc9cc2f8993856db 100644
--- a/scripts/split_rendering/lc3plus_basop/ivas_lc3plus_unit_test.c
+++ b/scripts/split_rendering/lc3plus_basop/ivas_lc3plus_unit_test.c
@@ -38,10 +38,10 @@ the United Nations Convention on Contracts on the International Sales of Goods.
 #include "isar_lc3plus_common.h"
 #include "isar_lc3plus_dec.h"
 #include "ivas_error_utils.h"
-#include "lc3plus.h"
+#include "lc3.h"
 
 #define MAX_SAMPLES_PER_CHANNEL 960 / 4
-#define DEFAULT_BPS 256000
+#define DEFAULT_BPS             256000
 
 #ifndef PCM_SAMPLE_TYPEDEF_DEFINED
 #define PCM_SAMPLE_TYPEDEF_DEFINED
@@ -93,23 +93,23 @@ static int encodeAndDecodeOneStereoFrame( LC3PLUS_CONFIG config, uint32_t bps )
     uint8_t *bitstream_out = malloc( bitstreamSizePerIvasFrame );
     memset( bitstream_out, 0, bitstreamSizePerIvasFrame );
 
-    int perChannelBitrate = lc3plus_enc_get_real_bitrate(encHandle->handles[0]);
-    int perLc3plusFrameDataBlockOctets = encHandle->num_ftds * perChannelBitrate / 8 / (1000*1000/config.lc3plus_frame_duration_us);
-    int targetOctets =  bps / 8 / (1000*1000/config.isar_frame_duration_us);
-    printf("IVAS-FS=%i LC3plus-FS=%i ch=%i targetBps=%i targetOctets=%i\n", config.isar_frame_duration_us, config.lc3plus_frame_duration_us, config.channels, bps, targetOctets);
-    printf("  coreBps=%i corePerChBps=%i coreCodecOctets=%i nFtds=%i \n", perChannelBitrate * encHandle->num_encs, perChannelBitrate, perLc3plusFrameDataBlockOctets, encHandle->num_ftds);
+    int perChannelBitrate = lc3plus_enc_get_real_bitrate( encHandle->handles[0] );
+    int perLc3plusFrameDataBlockOctets = encHandle->num_ftds * perChannelBitrate / 8 / ( 1000 * 1000 / config.lc3plus_frame_duration_us );
+    int targetOctets = bps / 8 / ( 1000 * 1000 / config.isar_frame_duration_us );
+    printf( "IVAS-FS=%i LC3plus-FS=%i ch=%i targetBps=%i targetOctets=%i\n", config.isar_frame_duration_us, config.lc3plus_frame_duration_us, config.channels, bps, targetOctets );
+    printf( "  coreBps=%i corePerChBps=%i coreCodecOctets=%i nFtds=%i \n", perChannelBitrate * encHandle->num_encs, perChannelBitrate, perLc3plusFrameDataBlockOctets, encHandle->num_ftds );
     int pfOctets = bitstreamSizePerIvasFrame - perLc3plusFrameDataBlockOctets;
-    int pfBps = pfOctets * 8 * (1000*1000 / config.isar_frame_duration_us);
-    printf("  payloadFormatBps=%i payloadFormatOctets=%i \n\n", pfBps,  pfOctets);
-    if(pfBps <= 0)
+    int pfBps = pfOctets * 8 * ( 1000 * 1000 / config.isar_frame_duration_us );
+    printf( "  payloadFormatBps=%i payloadFormatOctets=%i \n\n", pfBps, pfOctets );
+    if ( pfBps <= 0 )
     {
         ISAR_LC3PLUS_ENC_Close( &encHandle );
         return err;
     }
 
     Word16 Q_in[16];
-    memset(Q_in, 0, sizeof(Q_in) );
-        err = ISAR_LC3PLUS_ENC_Encode( encHandle, pcm_in, bitstream_out, bitstreamSizePerIvasFrame, Q_in );
+    memset( Q_in, 0, sizeof( Q_in ) );
+    err = ISAR_LC3PLUS_ENC_Encode( encHandle, pcm_in, bitstream_out, bitstreamSizePerIvasFrame, Q_in );
     if ( IVAS_ERR_OK != err )
     {
         ISAR_LC3PLUS_ENC_Close( &encHandle );
@@ -218,19 +218,19 @@ static int tryOpenEncoderWithInvalidBitrate( void )
     {
         return 1;
     }
-    limitedBitrate = lc3plus_enc_get_real_bitrate(encHandle->handles[0]);
-    if(limitedBitrate != 320000)
+    limitedBitrate = lc3plus_enc_get_real_bitrate( encHandle->handles[0] );
+    if ( limitedBitrate != 320000 )
     {
         return 1;
     }
-    ISAR_LC3PLUS_ENC_Close(&encHandle);
+    ISAR_LC3PLUS_ENC_Close( &encHandle );
     err = ISAR_LC3PLUS_ENC_Open( config, invalid_low_bps, &encHandle );
     /* setting an invalid bitrate should trigger an error - which is what we expect */
     if ( IVAS_ERR_LC3PLUS_INVALID_BITRATE != err )
     {
         return 1;
     }
-    ISAR_LC3PLUS_ENC_Close(&encHandle);
+    ISAR_LC3PLUS_ENC_Close( &encHandle );
     return 0;
 }
 
@@ -295,13 +295,13 @@ static int tryCallEncoderApiWithInvalidParams( void )
     }
     ISAR_LC3PLUS_ENC_Close( &invalidEncHandle );
     Word16 Q_in[16];
-    memset(Q_in, 0, sizeof(Q_in) );
-            if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_ENC_Encode( invalidEncHandle, invalidPcm_in, invalidBitstream_out, bsSize, Q_in ) )
+    memset( Q_in, 0, sizeof( Q_in ) );
+    if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_ENC_Encode( invalidEncHandle, invalidPcm_in, invalidBitstream_out, bsSize, Q_in ) )
     {
         return 1;
     }
-    memset(Q_in, 0, sizeof(Q_in) );
-            if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_ENC_Encode( invalidEncHandle, pcm_in, invalidBitstream_out, bsSize, Q_in) || IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_ENC_Encode( invalidEncHandle, invalidPcm_in, bitstream_out, bsSize, Q_in ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_ENC_Encode( invalidEncHandle, pcm_in, bitstream_out, bsSize, Q_in ) )
+    memset( Q_in, 0, sizeof( Q_in ) );
+    if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_ENC_Encode( invalidEncHandle, pcm_in, invalidBitstream_out, bsSize, Q_in ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_ENC_Encode( invalidEncHandle, invalidPcm_in, bitstream_out, bsSize, Q_in ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != ISAR_LC3PLUS_ENC_Encode( invalidEncHandle, pcm_in, bitstream_out, bsSize, Q_in ) )
     {
         return 1;
     }
@@ -448,7 +448,7 @@ static int encodeOneFrame( void )
     uint8_t *bitstream_out = malloc( bitstreamSizePerIvasFrame );
     memset( bitstream_out, 0, bitstreamSizePerIvasFrame );
     Word16 Q_in[16];
-    memset(Q_in, 0, sizeof(Q_in) );
+    memset( Q_in, 0, sizeof( Q_in ) );
     err = ISAR_LC3PLUS_ENC_Encode( encHandle, pcm, bitstream_out, bitstreamSizePerIvasFrame, Q_in );
 
     if ( IVAS_ERR_OK != err )
@@ -488,8 +488,8 @@ static int encodeAndDecodeOneMonoFrame( void )
     uint8_t *bitstream_out = malloc( bitstreamSizePerIvasFrame );
     memset( bitstream_out, 0, bitstreamSizePerIvasFrame );
     Word16 Q_in[16];
-    memset(Q_in, 0, sizeof(Q_in) );
-            err = ISAR_LC3PLUS_ENC_Encode( encHandle, pcm_in, bitstream_out, bitstreamSizePerIvasFrame, Q_in );
+    memset( Q_in, 0, sizeof( Q_in ) );
+    err = ISAR_LC3PLUS_ENC_Encode( encHandle, pcm_in, bitstream_out, bitstreamSizePerIvasFrame, Q_in );
     if ( IVAS_ERR_OK != err )
         return err;
     ISAR_LC3PLUS_ENC_Close( &encHandle );
@@ -582,25 +582,25 @@ static int encodeAndDecodeOneStereoFrameIvas20msLc3plus2_5ms_48kHz( void )
 static int encodeAndDecodeOneStereoFrameIvas10msLc3_10ms_48kHz_80kbpsPerChannel( void )
 {
     LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .isar_frame_duration_us = 10 * 1000, .channels = 2, .samplerate = 48000, .high_res_mode_enabled = 0 };
-    return encodeAndDecodeOneStereoFrame( config, config.channels * 82*1000 );
+    return encodeAndDecodeOneStereoFrame( config, config.channels * 82 * 1000 );
 }
 
 static int encodeAndDecodeOneStereoFrameIvas10msLc3_10ms_48kHz_96kbpsPerChannel( void )
 {
     LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .isar_frame_duration_us = 10 * 1000, .channels = 2, .samplerate = 48000, .high_res_mode_enabled = 0 };
-    return encodeAndDecodeOneStereoFrame( config, config.channels * 98*1000 );
+    return encodeAndDecodeOneStereoFrame( config, config.channels * 98 * 1000 );
 }
 
 static int encodeAndDecodeOneStereoFrameIvas10msLc3_10ms_48kHz_124kbpsPerChannel( void )
 {
     LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .isar_frame_duration_us = 10 * 1000, .channels = 2, .samplerate = 48000, .high_res_mode_enabled = 0 };
-    return encodeAndDecodeOneStereoFrame( config, config.channels * 126*1000 );
+    return encodeAndDecodeOneStereoFrame( config, config.channels * 126 * 1000 );
 }
 
 static int encodeAndDecodeOneStereoFrameIvas10msLc3_10ms_48kHz_800kbpsPerChannel( void )
 {
     LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .isar_frame_duration_us = 10 * 1000, .channels = 2, .samplerate = 48000, .high_res_mode_enabled = 0 };
-    return encodeAndDecodeOneStereoFrame( config, config.channels * 800*1000 );
+    return encodeAndDecodeOneStereoFrame( config, config.channels * 800 * 1000 );
 }
 
 static int encodeAndDecodeOneStereoFrameIvas10msLc3_10ms_48kHz_204800bpsPerChannel( void )
@@ -633,8 +633,8 @@ int main(
     int argc,
     char *argv[] )
 {
-    (void)argc;
-    (void)argv;
+    (void) argc;
+    (void) argv;
     int ret = 0;
     ret = openCloseEncoder();
     if ( ret != 0 )