Run clang-format

61 files changed, 165 insertions, 167 deletions

diff --git a/SmartDeviceLink/SDLAddCommand.m b/SmartDeviceLink/SDLAddCommand.m
index 72eee7f41..75524881c 100644
--- a/SmartDeviceLink/SDLAddCommand.m
+++ b/SmartDeviceLink/SDLAddCommand.m
@@ -43,18 +43,17 @@
     if (!self) {
         return nil;
     }
-    
+
     self.cmdID = @(commandId);
-    
+
     if (menuName != nil) {
         self.menuParams = [[SDLMenuParams alloc] initWithMenuName:menuName];
     }
-    
+
     self.vrCommands = [vrCommands mutableCopy];
     self.handler = handler;
-    
-    return self;
 
+    return self;
 }
 
 - (instancetype)initWithId:(UInt32)commandId vrCommands:(NSArray<NSString *> *)vrCommands menuName:(NSString *)menuName parentId:(UInt32)parentId position:(UInt16)position iconValue:(NSString *)iconValue iconType:(SDLImageType *)iconType handler:(SDLRPCNotificationHandler)handler {
@@ -62,10 +61,10 @@
     if (!self) {
         return nil;
     }
-    
+
     self.menuParams.parentID = @(parentId);
     self.menuParams.position = @(position);
-    
+
     if (iconValue != nil && iconType != nil) {
         self.cmdIcon = [[SDLImage alloc] initWithName:iconValue ofType:iconType];
     }
diff --git a/SmartDeviceLink/SDLAddSubMenu.m b/SmartDeviceLink/SDLAddSubMenu.m
index 983325dee..a4d22a284 100644
--- a/SmartDeviceLink/SDLAddSubMenu.m
+++ b/SmartDeviceLink/SDLAddSubMenu.m
@@ -24,9 +24,9 @@
     if (!self) {
         return nil;
     }
-    
+
     self.position = @(position);
-    
+
     return self;
 }
 
@@ -35,12 +35,11 @@
     if (!self) {
         return nil;
     }
-    
+
     self.menuID = @(menuId);
     self.menuName = menuName;
-    
+
     return self;
-    
 }
 
 - (void)setMenuID:(NSNumber *)menuID {
diff --git a/SmartDeviceLink/SDLAlert.m b/SmartDeviceLink/SDLAlert.m
index 372dc0e41..d5e11a12b 100644
--- a/SmartDeviceLink/SDLAlert.m
+++ b/SmartDeviceLink/SDLAlert.m
@@ -48,7 +48,7 @@ static UInt16 const SDLDefaultDuration = 5000;
 }
 
 - (instancetype)initWithTTS:(NSString *)ttsText alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 playTone:(BOOL)playTone duration:(UInt16)duration {
-    NSMutableArray* ttsChunks = [SDLTTSChunk textChunksFromString:ttsText];
+    NSMutableArray *ttsChunks = [SDLTTSChunk textChunksFromString:ttsText];
     return [self initWithTTSChunks:ttsChunks alertText1:alertText1 alertText2:alertText2 alertText3:alertText3 playTone:playTone duration:duration softButtons:nil];
 }
 
@@ -65,7 +65,7 @@ static UInt16 const SDLDefaultDuration = 5000;
     if (!self) {
         return nil;
     }
-    
+
     self.ttsChunks = [ttsChunks mutableCopy];
     self.alertText1 = alertText1;
     self.alertText2 = alertText2;
@@ -73,7 +73,7 @@ static UInt16 const SDLDefaultDuration = 5000;
     self.playTone = @(playTone);
     self.duration = @(duration);
     self.softButtons = [softButtons mutableCopy];
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLAlertManeuver.m b/SmartDeviceLink/SDLAlertManeuver.m
index d39b722fe..a3e6899b9 100644
--- a/SmartDeviceLink/SDLAlertManeuver.m
+++ b/SmartDeviceLink/SDLAlertManeuver.m
@@ -24,7 +24,7 @@
 }
 
 - (instancetype)initWithTTS:(NSString *)ttsText softButtons:(NSArray<SDLSoftButton *> *)softButtons {
-    NSMutableArray* ttsChunks = [SDLTTSChunk textChunksFromString:ttsText];
+    NSMutableArray *ttsChunks = [SDLTTSChunk textChunksFromString:ttsText];
     return [self initWithTTSChunks:ttsChunks softButtons:softButtons];
 }
 
@@ -33,7 +33,7 @@
     if (!self) {
         return nil;
     }
-    
+
     self.ttsChunks = [ttsChunks mutableCopy];
     self.softButtons = [softButtons mutableCopy];
 
diff --git a/SmartDeviceLink/SDLChangeRegistration.m b/SmartDeviceLink/SDLChangeRegistration.m
index 4e3cc2446..3a5c8051b 100644
--- a/SmartDeviceLink/SDLChangeRegistration.m
+++ b/SmartDeviceLink/SDLChangeRegistration.m
@@ -30,19 +30,19 @@
     return self;
 }
 
-- (instancetype)initWithLanguage:(SDLLanguage *)language hmiDisplayLanguage:(SDLLanguage *)hmiDisplayLanguage appName:(NSString *)appName ttsName:(NSArray *)ttsName ngnMediaScreenAppName:(NSString *)ngnMediaScreenAppName vrSynonyms:(NSArray*)vrSynonyms {
+- (instancetype)initWithLanguage:(SDLLanguage *)language hmiDisplayLanguage:(SDLLanguage *)hmiDisplayLanguage appName:(NSString *)appName ttsName:(NSArray *)ttsName ngnMediaScreenAppName:(NSString *)ngnMediaScreenAppName vrSynonyms:(NSArray *)vrSynonyms {
     self = [self init];
     if (!self) {
         return nil;
     }
-    
+
     self.language = language;
     self.hmiDisplayLanguage = hmiDisplayLanguage;
     self.appName = appName;
     self.ttsName = ttsName;
     self.ngnMediaScreenAppName = ngnMediaScreenAppName;
     self.vrSynonyms = vrSynonyms;
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLChoice.h b/SmartDeviceLink/SDLChoice.h
index 1c68a106f..d084ab33e 100644
--- a/SmartDeviceLink/SDLChoice.h
+++ b/SmartDeviceLink/SDLChoice.h
@@ -64,9 +64,9 @@
  */
 - (instancetype)initWithDictionary:(NSMutableDictionary *)dict;
 
-- (instancetype)initWithId:(UInt16)choiceId menuName:(NSString*)menuName vrCommands:(NSArray*)vrCommands;
+- (instancetype)initWithId:(UInt16)choiceId menuName:(NSString *)menuName vrCommands:(NSArray *)vrCommands;
 
-- (instancetype)initWithId:(UInt16)choiceId menuName:(NSString*)menuName vrCommands:(NSArray*)vrCommands image:(SDLImage*)image secondaryText:(NSString*)secondaryText secondaryImage:(SDLImage*)secondaryImage tertiaryText:(NSString*)tertiaryText;
+- (instancetype)initWithId:(UInt16)choiceId menuName:(NSString *)menuName vrCommands:(NSArray *)vrCommands image:(SDLImage *)image secondaryText:(NSString *)secondaryText secondaryImage:(SDLImage *)secondaryImage tertiaryText:(NSString *)tertiaryText;
 
 /**
  * @abstract the application-scoped identifier that uniquely identifies this choice
diff --git a/SmartDeviceLink/SDLChoice.m b/SmartDeviceLink/SDLChoice.m
index 89dc976f8..3195ddd9f 100644
--- a/SmartDeviceLink/SDLChoice.m
+++ b/SmartDeviceLink/SDLChoice.m
@@ -21,30 +21,30 @@
     return self;
 }
 
-- (instancetype)initWithId:(UInt16)choiceId menuName:(NSString*)menuName vrCommands:(NSArray*)vrCommands image:(SDLImage*)image secondaryText:(NSString*)secondaryText secondaryImage:(SDLImage*)secondaryImage tertiaryText:(NSString*)tertiaryText {
+- (instancetype)initWithId:(UInt16)choiceId menuName:(NSString *)menuName vrCommands:(NSArray *)vrCommands image:(SDLImage *)image secondaryText:(NSString *)secondaryText secondaryImage:(SDLImage *)secondaryImage tertiaryText:(NSString *)tertiaryText {
     self = [self initWithId:choiceId menuName:menuName vrCommands:vrCommands];
     if (!self) {
         return nil;
     }
-    
+
     self.image = image;
     self.secondaryText = secondaryText;
     self.secondaryImage = secondaryImage;
     self.tertiaryText = tertiaryText;
-    
+
     return self;
 }
 
-- (instancetype)initWithId:(UInt16)choiceId menuName:(NSString*)menuName vrCommands:(NSArray*)vrCommands {
+- (instancetype)initWithId:(UInt16)choiceId menuName:(NSString *)menuName vrCommands:(NSArray *)vrCommands {
     self = [self init];
     if (!self) {
         return nil;
     }
-    
+
     self.choiceID = @(choiceId);
     self.menuName = menuName;
     self.vrCommands = [vrCommands mutableCopy];
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
index 512f8a891..25539d8ea 100644
--- a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
+++ b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
@@ -26,7 +26,7 @@
     if (!self) {
         return nil;
     }
-    
+
     self.interactionChoiceSetID = @(choiceId);
     self.choiceSet = [choiceSet mutableCopy];
     return self;
diff --git a/SmartDeviceLink/SDLDeleteCommand.m b/SmartDeviceLink/SDLDeleteCommand.m
index 03e765f25..0f876e0ed 100644
--- a/SmartDeviceLink/SDLDeleteCommand.m
+++ b/SmartDeviceLink/SDLDeleteCommand.m
@@ -25,9 +25,9 @@
     if (!self) {
         return nil;
     }
-    
+
     self.cmdID = @(commandId);
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLDeleteFile.m b/SmartDeviceLink/SDLDeleteFile.m
index 355033c73..188a2ef1f 100644
--- a/SmartDeviceLink/SDLDeleteFile.m
+++ b/SmartDeviceLink/SDLDeleteFile.m
@@ -25,9 +25,9 @@
     if (!self) {
         return nil;
     }
-    
+
     self.syncFileName = fileName;
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
index ff557b860..4fe99ae45 100644
--- a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
+++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
@@ -25,9 +25,9 @@
     if (!self) {
         return nil;
     }
-    
+
     self.interactionChoiceSetID = @(choiceId);
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLDeleteSubMenu.m b/SmartDeviceLink/SDLDeleteSubMenu.m
index 565b16ff4..e3eed71a4 100644
--- a/SmartDeviceLink/SDLDeleteSubMenu.m
+++ b/SmartDeviceLink/SDLDeleteSubMenu.m
@@ -25,9 +25,9 @@
     if (!self) {
         return nil;
     }
-    
+
     self.menuID = @(menuId);
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLDiagnosticMessage.m b/SmartDeviceLink/SDLDiagnosticMessage.m
index e1f4da2fd..c92f17f90 100644
--- a/SmartDeviceLink/SDLDiagnosticMessage.m
+++ b/SmartDeviceLink/SDLDiagnosticMessage.m
@@ -20,16 +20,16 @@
     return self;
 }
 
-- (instancetype)initWithTargetId:(UInt16)targetId length:(UInt16)length data:(NSArray*)data {
+- (instancetype)initWithTargetId:(UInt16)targetId length:(UInt16)length data:(NSArray *)data {
     self = [self init];
     if (!self) {
         return nil;
     }
-    
+
     self.targetID = @(targetId);
     self.messageLength = @(length);
     self.messageData = [data mutableCopy];
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLDialNumber.m b/SmartDeviceLink/SDLDialNumber.m
index 2bc41beb5..95b51e226 100644
--- a/SmartDeviceLink/SDLDialNumber.m
+++ b/SmartDeviceLink/SDLDialNumber.m
@@ -25,9 +25,9 @@
     if (!self) {
         return nil;
     }
-    
+
     self.number = number;
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLGetDTCs.m b/SmartDeviceLink/SDLGetDTCs.m
index 19572bfdf..7041e44d4 100644
--- a/SmartDeviceLink/SDLGetDTCs.m
+++ b/SmartDeviceLink/SDLGetDTCs.m
@@ -25,9 +25,9 @@
     if (!self) {
         return nil;
     }
-    
+
     self.dtcMask = @(mask);
-    
+
     return self;
 }
 
@@ -36,9 +36,9 @@
     if (!self) {
         return nil;
     }
-    
+
     self.ecuName = @(name);
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m
index c79da6c6b..320350fc2 100644
--- a/SmartDeviceLink/SDLGetVehicleData.m
+++ b/SmartDeviceLink/SDLGetVehicleData.m
@@ -25,7 +25,7 @@
     if (!self) {
         return nil;
     }
-    
+
     self.accPedalPosition = @(accelerationPedalPosition);
     self.airbagStatus = @(airbagStatus);
     self.beltStatus = @(beltStatus);
@@ -51,7 +51,7 @@
     self.tirePressure = @(tirePressure);
     self.vin = @(vin);
     self.wiperStatus = @(wiperStatus);
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLImage.m b/SmartDeviceLink/SDLImage.m
index 734f0e475..84721ec0e 100644
--- a/SmartDeviceLink/SDLImage.m
+++ b/SmartDeviceLink/SDLImage.m
@@ -26,10 +26,10 @@
     if (!self) {
         return nil;
     }
-    
+
     self.value = name;
     self.imageType = imageType;
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLKeyboardProperties.h b/SmartDeviceLink/SDLKeyboardProperties.h
index f13c4c226..75611a03e 100644
--- a/SmartDeviceLink/SDLKeyboardProperties.h
+++ b/SmartDeviceLink/SDLKeyboardProperties.h
@@ -14,7 +14,7 @@
 - (instancetype)init;
 - (instancetype)initWithDictionary:(NSMutableDictionary *)dict;
 
-- (instancetype)initWithLanguage:(SDLLanguage*)language layout:(SDLKeyboardLayout*)layout keypressMode:(SDLKeypressMode*)keypressMode limitedCharacterList:(NSArray*)limitedCharacterList autoCompleteText:(NSString*)autoCompleteText;
+- (instancetype)initWithLanguage:(SDLLanguage *)language layout:(SDLKeyboardLayout *)layout keypressMode:(SDLKeypressMode *)keypressMode limitedCharacterList:(NSArray *)limitedCharacterList autoCompleteText:(NSString *)autoCompleteText;
 
 @property (strong) SDLLanguage *language;
 @property (strong) SDLKeyboardLayout *keyboardLayout;
diff --git a/SmartDeviceLink/SDLKeyboardProperties.m b/SmartDeviceLink/SDLKeyboardProperties.m
index 46849a7d5..d5c95bbc2 100644
--- a/SmartDeviceLink/SDLKeyboardProperties.m
+++ b/SmartDeviceLink/SDLKeyboardProperties.m
@@ -23,18 +23,18 @@
     return self;
 }
 
-- (instancetype)initWithLanguage:(SDLLanguage*)language layout:(SDLKeyboardLayout*)layout keypressMode:(SDLKeypressMode*)keypressMode limitedCharacterList:(NSArray*)limitedCharacterList autoCompleteText:(NSString*)autoCompleteText {
+- (instancetype)initWithLanguage:(SDLLanguage *)language layout:(SDLKeyboardLayout *)layout keypressMode:(SDLKeypressMode *)keypressMode limitedCharacterList:(NSArray *)limitedCharacterList autoCompleteText:(NSString *)autoCompleteText {
     self = [self init];
     if (!self) {
         return nil;
     }
-    
+
     self.language = language;
     self.keyboardLayout = layout;
     self.keypressMode = keypressMode;
     self.limitedCharacterList = [limitedCharacterList mutableCopy];
     self.autoCompleteText = autoCompleteText;
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLLifecycleManager.m b/SmartDeviceLink/SDLLifecycleManager.m
index 4bbe498dd..22a40b93e 100644
--- a/SmartDeviceLink/SDLLifecycleManager.m
+++ b/SmartDeviceLink/SDLLifecycleManager.m
@@ -187,7 +187,7 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
     }
 
     // Build a register app interface request with the configuration data
-    SDLRegisterAppInterface* regRequest = [[SDLRegisterAppInterface alloc] initWithLifecycleConfiguration:self.configuration.lifecycleConfig];
+    SDLRegisterAppInterface *regRequest = [[SDLRegisterAppInterface alloc] initWithLifecycleConfiguration:self.configuration.lifecycleConfig];
 
     // Send the request and depending on the response, post the notification
     __weak typeof(self) weakSelf = self;
diff --git a/SmartDeviceLink/SDLMenuParams.h b/SmartDeviceLink/SDLMenuParams.h
index 6a056d03f..6d2bd4d70 100644
--- a/SmartDeviceLink/SDLMenuParams.h
+++ b/SmartDeviceLink/SDLMenuParams.h
@@ -23,7 +23,7 @@
  */
 - (instancetype)initWithDictionary:(NSMutableDictionary *)dict;
 
-- (instancetype)initWithMenuName:(NSString*)menuName;
+- (instancetype)initWithMenuName:(NSString *)menuName;
 
 - (instancetype)initWithMenuName:(NSString *)menuName parentId:(UInt32)parentId position:(UInt16)position;
 
diff --git a/SmartDeviceLink/SDLMenuParams.m b/SmartDeviceLink/SDLMenuParams.m
index 0092d05be..aa41f4b4a 100644
--- a/SmartDeviceLink/SDLMenuParams.m
+++ b/SmartDeviceLink/SDLMenuParams.m
@@ -25,10 +25,10 @@
     if (!self) {
         return nil;
     }
-    
+
     self.parentID = @(parentId);
     self.position = @(parentId);
-    
+
     return self;
 }
 
@@ -37,9 +37,9 @@
     if (!self) {
         return nil;
     }
-    
+
     self.menuName = menuName;
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLPerformAudioPassThru.h b/SmartDeviceLink/SDLPerformAudioPassThru.h
index 1f495fbb2..3c2371fca 100644
--- a/SmartDeviceLink/SDLPerformAudioPassThru.h
+++ b/SmartDeviceLink/SDLPerformAudioPassThru.h
@@ -33,7 +33,7 @@
  */
 - (instancetype)initWithDictionary:(NSMutableDictionary *)dict;
 
-- (instancetype)initWithSamplingRate:(SDLSamplingRate*)samplingRate bitsPerSample:(SDLBitsPerSample*)bitsPerSample audioType:(SDLAudioType*)audioType maxDuration:(UInt32)maxDuration;
+- (instancetype)initWithSamplingRate:(SDLSamplingRate *)samplingRate bitsPerSample:(SDLBitsPerSample *)bitsPerSample audioType:(SDLAudioType *)audioType maxDuration:(UInt32)maxDuration;
 
 - (instancetype)initWithInitialPrompt:(NSString *)initialPrompt audioPassThruDisplayText1:(NSString *)audioPassThruDisplayText1 audioPassThruDisplayText2:(NSString *)audioPassThruDisplayText2 samplingRate:(SDLSamplingRate *)samplingRate bitsPerSample:(SDLBitsPerSample *)bitsPerSample audioType:(SDLAudioType *)audioType maxDuration:(UInt32)maxDuration muteAudio:(BOOL)muteAudio;
 
diff --git a/SmartDeviceLink/SDLPerformAudioPassThru.m b/SmartDeviceLink/SDLPerformAudioPassThru.m
index 86e945a55..da14cf9d8 100644
--- a/SmartDeviceLink/SDLPerformAudioPassThru.m
+++ b/SmartDeviceLink/SDLPerformAudioPassThru.m
@@ -31,7 +31,7 @@
     if (!self) {
         return nil;
     }
-    
+
     self.initialPrompt = [SDLTTSChunk textChunksFromString:initialPrompt];
     self.audioPassThruDisplayText1 = audioPassThruDisplayText1;
     self.audioPassThruDisplayText2 = audioPassThruDisplayText2;
@@ -40,17 +40,17 @@
     return self;
 }
 
-- (instancetype)initWithSamplingRate:(SDLSamplingRate*)samplingRate bitsPerSample:(SDLBitsPerSample*)bitsPerSample audioType:(SDLAudioType*)audioType maxDuration:(UInt32)maxDuration {
+- (instancetype)initWithSamplingRate:(SDLSamplingRate *)samplingRate bitsPerSample:(SDLBitsPerSample *)bitsPerSample audioType:(SDLAudioType *)audioType maxDuration:(UInt32)maxDuration {
     self = [self init];
     if (!self) {
         return nil;
     }
-    
+
     self.samplingRate = samplingRate;
     self.bitsPerSample = bitsPerSample;
     self.audioType = audioType;
     self.maxDuration = @(maxDuration);
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m
index df9dc9e59..4c8772f52 100644
--- a/SmartDeviceLink/SDLPerformInteraction.m
+++ b/SmartDeviceLink/SDLPerformInteraction.m
@@ -11,7 +11,7 @@
 #import "SDLTTSChunkFactory.h"
 #import "SDLVRHelpItem.h"
 
-static UInt16 const SDLDefaultTimeout  = 10000;
+static UInt16 const SDLDefaultTimeout = 10000;
 
 @implementation SDLPerformInteraction
 
@@ -44,9 +44,9 @@ static UInt16 const SDLDefaultTimeout  = 10000;
 }
 
 - (instancetype)initWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode *)interactionMode timeout:(UInt16)timeout vrHelp:(NSArray *)vrHelp {
-    NSMutableArray* initialChunks = [SDLTTSChunk textChunksFromString:initialPrompt];
-    NSMutableArray* helpChunks = [SDLTTSChunk textChunksFromString:helpPrompt];
-    NSMutableArray* timeoutChunks = [SDLTTSChunk textChunksFromString:timeoutPrompt];
+    NSMutableArray *initialChunks = [SDLTTSChunk textChunksFromString:initialPrompt];
+    NSMutableArray *helpChunks = [SDLTTSChunk textChunksFromString:helpPrompt];
+    NSMutableArray *timeoutChunks = [SDLTTSChunk textChunksFromString:timeoutPrompt];
     return [self initWithInitialChunks:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:helpChunks timeoutChunks:timeoutChunks interactionMode:interactionMode timeout:timeout vrHelp:vrHelp];
 }
 
@@ -55,7 +55,7 @@ static UInt16 const SDLDefaultTimeout  = 10000;
     if (!self) {
         return nil;
     }
-    
+
     self.initialPrompt = [initialChunks mutableCopy];
     self.initialText = initialText;
     self.helpPrompt = [helpChunks mutableCopy];
@@ -72,9 +72,9 @@ static UInt16 const SDLDefaultTimeout  = 10000;
     if (!self) {
         return nil;
     }
-    
+
     self.interactionChoiceSetIDList = [interactionChoiceSetIdList mutableCopy];
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLPermissionConstants.h b/SmartDeviceLink/SDLPermissionConstants.h
index 80a123132..03b89867a 100644
--- a/SmartDeviceLink/SDLPermissionConstants.h
+++ b/SmartDeviceLink/SDLPermissionConstants.h
@@ -12,8 +12,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef NSString * SDLPermissionRPCName;
-typedef NSUUID * SDLPermissionObserverIdentifier;
+typedef NSString *SDLPermissionRPCName;
+typedef NSUUID *SDLPermissionObserverIdentifier;
 
 /**
  *  A permission group type which will be used to tell the system what type of changes you want to be notified about for the group.
diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m
index 8fe0f4294..6d62d6570 100644
--- a/SmartDeviceLink/SDLProxy.m
+++ b/SmartDeviceLink/SDLProxy.m
@@ -696,7 +696,7 @@ const int POLICIES_CORRELATION_ID = 65535;
             for (id<SDLProxyListener> listener in self.proxyListeners) {
                 if ([listener respondsToSelector:aSelector]) {
                     // HAX: http://stackoverflow.com/questions/7017281/performselector-may-cause-a-leak-because-its-selector-is-unknown
-                    ((void ( *)(id, SEL, id))[(NSObject *)listener methodForSelector:aSelector])(listener, aSelector, object);
+                    ((void (*)(id, SEL, id))[(NSObject *)listener methodForSelector:aSelector])(listener, aSelector, object);
                 }
             }
         }
diff --git a/SmartDeviceLink/SDLPutFile.h b/SmartDeviceLink/SDLPutFile.h
index f2d94ccf2..f0a74f95e 100644
--- a/SmartDeviceLink/SDLPutFile.h
+++ b/SmartDeviceLink/SDLPutFile.h
@@ -29,7 +29,7 @@
  */
 - (instancetype)initWithDictionary:(NSMutableDictionary *)dict;
 
-- (instancetype)initWithFileName:(NSString*)fileName fileType:(SDLFileType*)fileType;
+- (instancetype)initWithFileName:(NSString *)fileName fileType:(SDLFileType *)fileType;
 
 - (instancetype)initWithFileName:(NSString *)fileName fileType:(SDLFileType *)fileType persistentFile:(BOOL)persistentFile;
 
diff --git a/SmartDeviceLink/SDLPutFile.m b/SmartDeviceLink/SDLPutFile.m
index aeabe5531..0442d3655 100644
--- a/SmartDeviceLink/SDLPutFile.m
+++ b/SmartDeviceLink/SDLPutFile.m
@@ -26,11 +26,11 @@
     if (!self) {
         return nil;
     }
-    
+
     self.systemFile = @(systemFile);
     self.offset = @(offset);
     self.length = @(length);
-    
+
     return self;
 }
 
@@ -39,21 +39,21 @@
     if (!self) {
         return nil;
     }
-    
+
     self.persistentFile = @(persistentFile);
 
     return self;
 }
 
-- (instancetype)initWithFileName:(NSString*)fileName fileType:(SDLFileType*)fileType {
+- (instancetype)initWithFileName:(NSString *)fileName fileType:(SDLFileType *)fileType {
     self = [self init];
     if (!self) {
         return nil;
     }
-    
+
     self.syncFileName = fileName;
     self.fileType = fileType;
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLReadDID.m b/SmartDeviceLink/SDLReadDID.m
index 1298f7b24..082d717a3 100644
--- a/SmartDeviceLink/SDLReadDID.m
+++ b/SmartDeviceLink/SDLReadDID.m
@@ -25,10 +25,10 @@
     if (!self) {
         return nil;
     }
-    
+
     self.ecuName = @(ecuName);
     self.didLocation = [didLocation mutableCopy];
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLRegisterAppInterface.h b/SmartDeviceLink/SDLRegisterAppInterface.h
index 205a0b724..694554747 100644
--- a/SmartDeviceLink/SDLRegisterAppInterface.h
+++ b/SmartDeviceLink/SDLRegisterAppInterface.h
@@ -101,9 +101,9 @@
 
 - (instancetype)initWithAppName:(NSString *)appName appId:(NSString *)appId languageDesired:(SDLLanguage *)languageDesired;
 
-- (instancetype)initWithAppName:(NSString *)appName appId:(NSString *)appId languageDesired:(SDLLanguage *)languageDesired isMediaApp:(BOOL)isMediaApp appType:(SDLAppHMIType*)appType shortAppName:(NSString *)shortAppName;
+- (instancetype)initWithAppName:(NSString *)appName appId:(NSString *)appId languageDesired:(SDLLanguage *)languageDesired isMediaApp:(BOOL)isMediaApp appType:(SDLAppHMIType *)appType shortAppName:(NSString *)shortAppName;
 
-- (instancetype)initWithAppName:(NSString *)appName appId:(NSString *)appId languageDesired:(SDLLanguage *)languageDesired isMediaApp:(BOOL)isMediaApp appType:(SDLAppHMIType*)appType shortAppName:(NSString *)shortAppName ttsName:(NSArray<SDLTTSChunk *> *)ttsName vrSynonyms:(NSArray<NSString *> *)vrSynonyms hmiDisplayLanguageDesired:(SDLLanguage *)hmiDisplayLanguageDesired resumeHash:(NSString*)resumeHash;
+- (instancetype)initWithAppName:(NSString *)appName appId:(NSString *)appId languageDesired:(SDLLanguage *)languageDesired isMediaApp:(BOOL)isMediaApp appType:(SDLAppHMIType *)appType shortAppName:(NSString *)shortAppName ttsName:(NSArray<SDLTTSChunk *> *)ttsName vrSynonyms:(NSArray<NSString *> *)vrSynonyms hmiDisplayLanguageDesired:(SDLLanguage *)hmiDisplayLanguageDesired resumeHash:(NSString *)resumeHash;
 
 /**
  * @abstract The version of the SDL interface
diff --git a/SmartDeviceLink/SDLRegisterAppInterface.m b/SmartDeviceLink/SDLRegisterAppInterface.m
index ee1bfb8ad..97657563e 100644
--- a/SmartDeviceLink/SDLRegisterAppInterface.m
+++ b/SmartDeviceLink/SDLRegisterAppInterface.m
@@ -7,8 +7,8 @@
 #import "SDLAppHMIType.h"
 #import "SDLAppInfo.h"
 #import "SDLDeviceInfo.h"
-#import "SDLLifecycleConfiguration.h"
 #import "SDLLanguage.h"
+#import "SDLLifecycleConfiguration.h"
 #import "SDLNames.h"
 #import "SDLSyncMsgVersion.h"
 #import "SDLTTSChunk.h"
@@ -29,7 +29,7 @@
 }
 
 - (instancetype)initWithLifecycleConfiguration:(SDLLifecycleConfiguration *)lifecycleConfiguration {
-    return [self initWithAppName:lifecycleConfiguration.appName appId:lifecycleConfiguration.appId languageDesired:lifecycleConfiguration.language isMediaApp:lifecycleConfiguration.isMedia appType:lifecycleConfiguration.appType shortAppName:lifecycleConfiguration.shortAppName  ttsName:lifecycleConfiguration.ttsName vrSynonyms:lifecycleConfiguration.voiceRecognitionCommandNames hmiDisplayLanguageDesired:lifecycleConfiguration.language resumeHash:lifecycleConfiguration.resumeHash];
+    return [self initWithAppName:lifecycleConfiguration.appName appId:lifecycleConfiguration.appId languageDesired:lifecycleConfiguration.language isMediaApp:lifecycleConfiguration.isMedia appType:lifecycleConfiguration.appType shortAppName:lifecycleConfiguration.shortAppName ttsName:lifecycleConfiguration.ttsName vrSynonyms:lifecycleConfiguration.voiceRecognitionCommandNames hmiDisplayLanguageDesired:lifecycleConfiguration.language resumeHash:lifecycleConfiguration.resumeHash];
 }
 
 - (instancetype)initWithAppName:(NSString *)appName appId:(NSString *)appId languageDesired:(SDLLanguage *)languageDesired {
@@ -45,15 +45,15 @@
     if (!self) {
         return nil;
     }
-    
+
     self.appID = appId;
     self.appName = appName;
     self.ngnMediaScreenAppName = shortAppName;
-    
+
     if (appType != nil) {
         self.appHMIType = [NSMutableArray arrayWithObject:appType];
     }
-    
+
     self.languageDesired = languageDesired;
     self.hmiDisplayLanguageDesired = hmiDisplayLanguageDesired;
     self.isMediaApplication = @(isMediaApp);
@@ -64,7 +64,7 @@
     self.deviceInfo = [SDLDeviceInfo currentDevice];
     self.hashID = resumeHash;
     self.correlationID = @1;
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLResetGlobalProperties.m b/SmartDeviceLink/SDLResetGlobalProperties.m
index 795523206..737de4b3a 100644
--- a/SmartDeviceLink/SDLResetGlobalProperties.m
+++ b/SmartDeviceLink/SDLResetGlobalProperties.m
@@ -26,7 +26,7 @@
     if (!self) {
         return nil;
     }
-    
+
     self.properties = [properties mutableCopy];
 
     return self;
diff --git a/SmartDeviceLink/SDLScrollableMessage.m b/SmartDeviceLink/SDLScrollableMessage.m
index ada0d0a98..ecc771c18 100644
--- a/SmartDeviceLink/SDLScrollableMessage.m
+++ b/SmartDeviceLink/SDLScrollableMessage.m
@@ -26,7 +26,7 @@
     if (!self) {
         return nil;
     }
-    
+
     self.timeout = @(timeout);
     self.softButtons = [softButtons mutableCopy];
 
@@ -38,9 +38,9 @@
     if (!self) {
         return nil;
     }
-    
+
     self.scrollableMessageBody = message;
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLSendLocation.h b/SmartDeviceLink/SDLSendLocation.h
index 7d0bb91ec..0b7a77a19 100644
--- a/SmartDeviceLink/SDLSendLocation.h
+++ b/SmartDeviceLink/SDLSendLocation.h
@@ -2,8 +2,8 @@
 //  SDLSendLocation.h
 //  SmartDeviceLink
 
-#import <Foundation/Foundation.h>
 #import <CoreGraphics/CGBase.h>
+#import <Foundation/Foundation.h>
 
 #import "SDLImage.h"
 #import "SDLRPCRequest.h"
diff --git a/SmartDeviceLink/SDLSendLocation.m b/SmartDeviceLink/SDLSendLocation.m
index 211ce2e96..83a420ccc 100644
--- a/SmartDeviceLink/SDLSendLocation.m
+++ b/SmartDeviceLink/SDLSendLocation.m
@@ -32,7 +32,7 @@
     if (!self) {
         return nil;
     }
-    
+
     self.longitudeDegrees = @(longitude);
     self.latitudeDegrees = @(latitude);
     self.locationName = locationName;
@@ -40,7 +40,7 @@
     self.addressLines = address;
     self.phoneNumber = phoneNumber;
     self.locationImage = image;
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLSetAppIcon.m b/SmartDeviceLink/SDLSetAppIcon.m
index a5eec4e4d..011579575 100644
--- a/SmartDeviceLink/SDLSetAppIcon.m
+++ b/SmartDeviceLink/SDLSetAppIcon.m
@@ -25,9 +25,9 @@
     if (!self) {
         return nil;
     }
-    
+
     self.syncFileName = fileName;
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLSetDisplayLayout.m b/SmartDeviceLink/SDLSetDisplayLayout.m
index 2a1e0d0a3..21c0eebfc 100644
--- a/SmartDeviceLink/SDLSetDisplayLayout.m
+++ b/SmartDeviceLink/SDLSetDisplayLayout.m
@@ -30,9 +30,9 @@
     if (!self) {
         return nil;
     }
-    
+
     self.displayLayout = displayLayout;
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLSetGlobalProperties.h b/SmartDeviceLink/SDLSetGlobalProperties.h
index 4c0320f65..fbf3bf794 100644
--- a/SmartDeviceLink/SDLSetGlobalProperties.h
+++ b/SmartDeviceLink/SDLSetGlobalProperties.h
@@ -35,7 +35,7 @@
 
 - (instancetype)initWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText vrHelpTitle:(NSString *)vrHelpTitle vrHelp:(NSArray *)vrHelp;
 
-- (instancetype)initWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText vrHelpTitle:(NSString *)vrHelpTitle vrHelp:(NSArray *)vrHelp menuTitle:(NSString*)menuTitle menuIcon:(SDLImage*)menuIcon keyboardProperties:(SDLKeyboardProperties*)keyboardProperties;
+- (instancetype)initWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText vrHelpTitle:(NSString *)vrHelpTitle vrHelp:(NSArray *)vrHelp menuTitle:(NSString *)menuTitle menuIcon:(SDLImage *)menuIcon keyboardProperties:(SDLKeyboardProperties *)keyboardProperties;
 
 /**
  * @abstract Sets a Vector<TTSChunk> for Help Prompt that Array of one or more
diff --git a/SmartDeviceLink/SDLSetGlobalProperties.m b/SmartDeviceLink/SDLSetGlobalProperties.m
index a5f0ffb8f..490c1fc34 100644
--- a/SmartDeviceLink/SDLSetGlobalProperties.m
+++ b/SmartDeviceLink/SDLSetGlobalProperties.m
@@ -39,7 +39,7 @@
     if (!self) {
         return nil;
     }
-    
+
     self.helpPrompt = [SDLTTSChunk textChunksFromString:helpText];
     self.timeoutPrompt = [SDLTTSChunk textChunksFromString:timeoutText];
     self.vrHelpTitle = vrHelpTitle;
@@ -47,7 +47,7 @@
     self.menuTitle = menuTitle;
     self.menuIcon = menuIcon;
     self.keyboardProperties = keyboardProperties;
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLSetMediaClockTimer.m b/SmartDeviceLink/SDLSetMediaClockTimer.m
index 04ef841b8..61953c912 100644
--- a/SmartDeviceLink/SDLSetMediaClockTimer.m
+++ b/SmartDeviceLink/SDLSetMediaClockTimer.m
@@ -29,7 +29,7 @@
     if (!self) {
         return nil;
     }
-    
+
     self.startTime = [[SDLStartTime alloc] initWithHours:hours minutes:minutes seconds:seconds];
 
     return self;
@@ -40,9 +40,9 @@
     if (!self) {
         return nil;
     }
-    
+
     self.updateMode = updateMode;
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLShow.h b/SmartDeviceLink/SDLShow.h
index c692bd84c..45849cd48 100644
--- a/SmartDeviceLink/SDLShow.h
+++ b/SmartDeviceLink/SDLShow.h
@@ -45,7 +45,7 @@
 
 - (instancetype)initWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 alignment:(SDLTextAlignment *)alignment;
 
-- (instancetype)initWithMainField1:(NSString*)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString*)mainField3 mainField4:(NSString*)mainField4 alignment:(SDLTextAlignment *)alignment;
+- (instancetype)initWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString *)mainField3 mainField4:(NSString *)mainField4 alignment:(SDLTextAlignment *)alignment;
 
 - (instancetype)initWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 alignment:(SDLTextAlignment *)alignment statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack;
 
diff --git a/SmartDeviceLink/SDLShow.m b/SmartDeviceLink/SDLShow.m
index a6edbdf09..36251d3bc 100644
--- a/SmartDeviceLink/SDLShow.m
+++ b/SmartDeviceLink/SDLShow.m
@@ -28,7 +28,7 @@
     return [self initWithMainField1:mainField1 mainField2:mainField2 mainField3:nil mainField4:nil alignment:alignment];
 }
 
-- (instancetype)initWithMainField1:(NSString*)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString*)mainField3 mainField4:(NSString*)mainField4 alignment:(SDLTextAlignment *)alignment {
+- (instancetype)initWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString *)mainField3 mainField4:(NSString *)mainField4 alignment:(SDLTextAlignment *)alignment {
     return [self initWithMainField1:mainField1 mainField2:mainField2 mainField3:mainField3 mainField4:mainField4 alignment:alignment statusBar:nil mediaClock:nil mediaTrack:nil graphic:nil softButtons:nil customPresets:nil];
 }
 
@@ -41,7 +41,7 @@
     if (!self) {
         return nil;
     }
-    
+
     self.mainField1 = mainField1;
     self.mainField2 = mainField2;
     self.mainField3 = mainField3;
@@ -53,7 +53,7 @@
     self.graphic = graphic;
     self.softButtons = [softButtons mutableCopy];
     self.customPresets = [customPresets mutableCopy];
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLShowConstantTBT.m b/SmartDeviceLink/SDLShowConstantTBT.m
index 0e021d831..87079df6a 100644
--- a/SmartDeviceLink/SDLShowConstantTBT.m
+++ b/SmartDeviceLink/SDLShowConstantTBT.m
@@ -28,7 +28,7 @@
     if (!self) {
         return nil;
     }
-    
+
     self.navigationText1 = navigationText1;
     self.navigationText2 = navigationText2;
     self.eta = eta;
@@ -40,7 +40,7 @@
     self.distanceToManeuverScale = @(distanceToManeuverScale);
     self.maneuverComplete = @(maneuverComplete);
     self.softButtons = [softButtons mutableCopy];
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLSlider.m b/SmartDeviceLink/SDLSlider.m
index a5a983bc6..38226ffdf 100644
--- a/SmartDeviceLink/SDLSlider.m
+++ b/SmartDeviceLink/SDLSlider.m
@@ -22,12 +22,12 @@
 
 - (instancetype)initWithNumTicks:(UInt8)numTicks position:(UInt8)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSString *)sliderFooter timeout:(UInt16)timeout {
     NSMutableArray *sliderFooters = [NSMutableArray arrayWithCapacity:numTicks];
-    
+
     // Populates array with the same footer value for each position
     for (int i = 0; i < sliderFooters.count; i++) {
         sliderFooters[0] = sliderFooter;
     }
-    
+
     return [self initWithNumTicks:numTicks position:position sliderHeader:sliderHeader sliderFooter:[sliderFooters copy] timeout:timeout];
 }
 
@@ -36,11 +36,11 @@
     if (!self) {
         return nil;
     }
-    
+
     self.sliderHeader = sliderHeader;
     self.sliderFooter = [sliderFooters mutableCopy];
     self.timeout = @(timeout);
-    
+
     return self;
 }
 
@@ -49,10 +49,10 @@
     if (!self) {
         return nil;
     }
-    
+
     self.numTicks = @(numTicks);
     self.position = @(position);
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLSoftButton.m b/SmartDeviceLink/SDLSoftButton.m
index 818047f8a..b6b5cb484 100644
--- a/SmartDeviceLink/SDLSoftButton.m
+++ b/SmartDeviceLink/SDLSoftButton.m
@@ -39,7 +39,7 @@
     if (!self) {
         return nil;
     }
-    
+
     self.type = type;
     self.text = text;
     self.image = image;
@@ -47,7 +47,7 @@
     self.softButtonID = @(buttonId);
     self.systemAction = systemAction;
     self.handler = handler;
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLSpeak.m b/SmartDeviceLink/SDLSpeak.m
index 197a77355..875e4e513 100644
--- a/SmartDeviceLink/SDLSpeak.m
+++ b/SmartDeviceLink/SDLSpeak.m
@@ -23,7 +23,7 @@
 }
 
 - (instancetype)initWithTTS:(NSString *)ttsText {
-    NSMutableArray* ttsChunks = [SDLTTSChunk textChunksFromString:ttsText];
+    NSMutableArray *ttsChunks = [SDLTTSChunk textChunksFromString:ttsText];
     return [self initWithTTSChunks:ttsChunks];
 }
 
@@ -32,9 +32,9 @@
     if (!self) {
         return nil;
     }
-    
+
     self.ttsChunks = [ttsChunks mutableCopy];
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLStartTime.m b/SmartDeviceLink/SDLStartTime.m
index 15b6a3f0c..574d4f552 100644
--- a/SmartDeviceLink/SDLStartTime.m
+++ b/SmartDeviceLink/SDLStartTime.m
@@ -25,7 +25,7 @@
     if (!self) {
         return nil;
     }
-    
+
     self.hours = @(hours);
     self.minutes = @(minutes);
     self.seconds = @(seconds);
diff --git a/SmartDeviceLink/SDLSubscribeButton.m b/SmartDeviceLink/SDLSubscribeButton.m
index 69290eaa4..969ee9a75 100644
--- a/SmartDeviceLink/SDLSubscribeButton.m
+++ b/SmartDeviceLink/SDLSubscribeButton.m
@@ -38,10 +38,10 @@
     if (!self) {
         return nil;
     }
-    
+
     self.buttonName = buttonName;
     self.handler = handler;
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.m b/SmartDeviceLink/SDLSubscribeVehicleData.m
index c9938a09d..2fb50e364 100644
--- a/SmartDeviceLink/SDLSubscribeVehicleData.m
+++ b/SmartDeviceLink/SDLSubscribeVehicleData.m
@@ -25,7 +25,7 @@
     if (!self) {
         return nil;
     }
-    
+
     self.accPedalPosition = @(accelerationPedalPosition);
     self.airbagStatus = @(airbagStatus);
     self.beltStatus = @(beltStatus);
@@ -50,7 +50,7 @@
     self.steeringWheelAngle = @(steeringWheelAngle);
     self.tirePressure = @(tirePressure);
     self.wiperStatus = @(wiperStatus);
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLSyncMsgVersion.m b/SmartDeviceLink/SDLSyncMsgVersion.m
index 4de144bd4..704ec7e7e 100644
--- a/SmartDeviceLink/SDLSyncMsgVersion.m
+++ b/SmartDeviceLink/SDLSyncMsgVersion.m
@@ -25,10 +25,10 @@
     if (!self) {
         return nil;
     }
-    
+
     self.majorVersion = @(majorVersion);
     self.minorVersion = @(minorVersion);
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLSystemRequest.m b/SmartDeviceLink/SDLSystemRequest.m
index 5deaff059..adbd1f724 100644
--- a/SmartDeviceLink/SDLSystemRequest.m
+++ b/SmartDeviceLink/SDLSystemRequest.m
@@ -27,7 +27,7 @@
     if (!self) {
         return nil;
     }
-    
+
     self.requestType = requestType;
     self.fileName = fileName;
 
diff --git a/SmartDeviceLink/SDLTTSChunk.h b/SmartDeviceLink/SDLTTSChunk.h
index f0664cd6f..151451bdf 100644
--- a/SmartDeviceLink/SDLTTSChunk.h
+++ b/SmartDeviceLink/SDLTTSChunk.h
@@ -52,17 +52,17 @@
  */
 - (instancetype)initWithDictionary:(NSMutableDictionary *)dict;
 
-- (instancetype)initWithText:(NSString*)text type:(SDLSpeechCapabilities*)type;
+- (instancetype)initWithText:(NSString *)text type:(SDLSpeechCapabilities *)type;
 
-+ (NSMutableArray<SDLTTSChunk *>*)textChunksFromString:(NSString*)string;
++ (NSMutableArray<SDLTTSChunk *> *)textChunksFromString:(NSString *)string;
 
-+ (NSMutableArray<SDLTTSChunk *>*)sapiChunksFromString:(NSString*)string;
++ (NSMutableArray<SDLTTSChunk *> *)sapiChunksFromString:(NSString *)string;
 
-+ (NSMutableArray<SDLTTSChunk *>*)lhPlusChunksFromString:(NSString*)string;
++ (NSMutableArray<SDLTTSChunk *> *)lhPlusChunksFromString:(NSString *)string;
 
-+ (NSMutableArray<SDLTTSChunk *>*)prerecordedChunksFromString:(NSString*)string;
++ (NSMutableArray<SDLTTSChunk *> *)prerecordedChunksFromString:(NSString *)string;
 
-+ (NSMutableArray<SDLTTSChunk *>*)silenceChunks;
++ (NSMutableArray<SDLTTSChunk *> *)silenceChunks;
 
 
 /**
diff --git a/SmartDeviceLink/SDLTTSChunk.m b/SmartDeviceLink/SDLTTSChunk.m
index 1d509f853..939689b98 100644
--- a/SmartDeviceLink/SDLTTSChunk.m
+++ b/SmartDeviceLink/SDLTTSChunk.m
@@ -21,43 +21,43 @@
     return self;
 }
 
-- (instancetype)initWithText:(NSString*)text type:(SDLSpeechCapabilities*)type {
+- (instancetype)initWithText:(NSString *)text type:(SDLSpeechCapabilities *)type {
     self = [self init];
     if (!self) {
         return nil;
     }
-    
+
     self.text = text;
     self.type = type;
-    
+
     return self;
 }
 
-+ (NSMutableArray<SDLTTSChunk *>*)textChunksFromString:(NSString*)string {
++ (NSMutableArray<SDLTTSChunk *> *)textChunksFromString:(NSString *)string {
     return [self sdl_chunksFromString:string type:[SDLSpeechCapabilities TEXT]];
 }
 
-+ (NSMutableArray<SDLTTSChunk *>*)sapiChunksFromString:(NSString*)string {
++ (NSMutableArray<SDLTTSChunk *> *)sapiChunksFromString:(NSString *)string {
     return [self sdl_chunksFromString:string type:[SDLSpeechCapabilities SAPI_PHONEMES]];
 }
 
-+ (NSMutableArray<SDLTTSChunk *>*)lhPlusChunksFromString:(NSString*)string {
++ (NSMutableArray<SDLTTSChunk *> *)lhPlusChunksFromString:(NSString *)string {
     return [self sdl_chunksFromString:string type:[SDLSpeechCapabilities LHPLUS_PHONEMES]];
 }
 
-+ (NSMutableArray<SDLTTSChunk *>*)prerecordedChunksFromString:(NSString*)string {
++ (NSMutableArray<SDLTTSChunk *> *)prerecordedChunksFromString:(NSString *)string {
     return [self sdl_chunksFromString:string type:[SDLSpeechCapabilities PRE_RECORDED]];
 }
 
-+ (NSMutableArray<SDLTTSChunk *>*)silenceChunks {
++ (NSMutableArray<SDLTTSChunk *> *)silenceChunks {
     return [self sdl_chunksFromString:nil type:[SDLSpeechCapabilities SILENCE]];
 }
 
-+ (NSMutableArray<SDLTTSChunk *>*)sdl_chunksFromString:(NSString*)string type:(SDLSpeechCapabilities*)type {
++ (NSMutableArray<SDLTTSChunk *> *)sdl_chunksFromString:(NSString *)string type:(SDLSpeechCapabilities *)type {
     if (string.length == 0) {
         return nil;
     }
-    
+
     return [NSMutableArray arrayWithObject:[[[self class] alloc] initWithText:string type:type]];
 }
 
diff --git a/SmartDeviceLink/SDLTurn.h b/SmartDeviceLink/SDLTurn.h
index 5c9b155a5..f7d5c7d53 100644
--- a/SmartDeviceLink/SDLTurn.h
+++ b/SmartDeviceLink/SDLTurn.h
@@ -12,7 +12,7 @@
 - (instancetype)init;
 - (instancetype)initWithDictionary:(NSMutableDictionary *)dict;
 
-- (instancetype)initWithNavigationText:(NSString*)navigationText turnIcon:(SDLImage*)icon;
+- (instancetype)initWithNavigationText:(NSString *)navigationText turnIcon:(SDLImage *)icon;
 
 @property (strong) NSString *navigationText;
 @property (strong) SDLImage *turnIcon;
diff --git a/SmartDeviceLink/SDLTurn.m b/SmartDeviceLink/SDLTurn.m
index 2e753c8be..8d6787bd9 100644
--- a/SmartDeviceLink/SDLTurn.m
+++ b/SmartDeviceLink/SDLTurn.m
@@ -21,15 +21,15 @@
     return self;
 }
 
-- (instancetype)initWithNavigationText:(NSString*)navigationText turnIcon:(SDLImage*)icon {
+- (instancetype)initWithNavigationText:(NSString *)navigationText turnIcon:(SDLImage *)icon {
     self = [self init];
     if (!self) {
         return nil;
     }
-    
+
     self.navigationText = navigationText;
     self.turnIcon = icon;
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLUnsubscribeButton.m b/SmartDeviceLink/SDLUnsubscribeButton.m
index 90df09b24..a54b30ca2 100644
--- a/SmartDeviceLink/SDLUnsubscribeButton.m
+++ b/SmartDeviceLink/SDLUnsubscribeButton.m
@@ -27,9 +27,9 @@
     if (!self) {
         return nil;
     }
-    
+
     self.buttonName = buttonName;
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.m b/SmartDeviceLink/SDLUnsubscribeVehicleData.m
index 5771808fb..b9e89feeb 100644
--- a/SmartDeviceLink/SDLUnsubscribeVehicleData.m
+++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.m
@@ -25,7 +25,7 @@
     if (!self) {
         return nil;
     }
-    
+
     self.accPedalPosition = @(accelerationPedalPosition);
     self.airbagStatus = @(airbagStatus);
     self.beltStatus = @(beltStatus);
diff --git a/SmartDeviceLink/SDLUpdateTurnList.m b/SmartDeviceLink/SDLUpdateTurnList.m
index 65cb06fb0..65f37f60a 100644
--- a/SmartDeviceLink/SDLUpdateTurnList.m
+++ b/SmartDeviceLink/SDLUpdateTurnList.m
@@ -27,10 +27,10 @@
     if (!self) {
         return nil;
     }
-    
+
     self.turnList = [turnList mutableCopy];
     self.softButtons = [softButtons mutableCopy];
-    
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLVrHelpItem.h b/SmartDeviceLink/SDLVrHelpItem.h
index 21c23b003..514d3e29f 100644
--- a/SmartDeviceLink/SDLVrHelpItem.h
+++ b/SmartDeviceLink/SDLVrHelpItem.h
@@ -12,9 +12,9 @@
 - (instancetype)init;
 - (instancetype)initWithDictionary:(NSMutableDictionary *)dict;
 
-- (instancetype)initWithText:(NSString*)text image:(SDLImage*)image;
+- (instancetype)initWithText:(NSString *)text image:(SDLImage *)image;
 
-- (instancetype)initWithText:(NSString*)text image:(SDLImage*)image position:(UInt8)position;
+- (instancetype)initWithText:(NSString *)text image:(SDLImage *)image position:(UInt8)position;
 
 @property (strong) NSString *text;
 @property (strong) SDLImage *image;
diff --git a/SmartDeviceLink/SDLVrHelpItem.m b/SmartDeviceLink/SDLVrHelpItem.m
index 5e9177b04..97dc86df4 100644
--- a/SmartDeviceLink/SDLVrHelpItem.m
+++ b/SmartDeviceLink/SDLVrHelpItem.m
@@ -21,26 +21,26 @@
     return self;
 }
 
-- (instancetype)initWithText:(NSString*)text image:(SDLImage*)image position:(UInt8)position {
+- (instancetype)initWithText:(NSString *)text image:(SDLImage *)image position:(UInt8)position {
     self = [self initWithText:text image:image];
     if (!self) {
         return nil;
     }
-    
+
     self.position = @(position);
-    
+
     return self;
 }
 
-- (instancetype)initWithText:(NSString*)text image:(SDLImage*)image {
+- (instancetype)initWithText:(NSString *)text image:(SDLImage *)image {
     self = [self init];
     if (!self) {
         return nil;
     }
-    
+
     self.text = text;
     self.image = image;
-    
+
     return self;
 }