Updated inits to avoid right shift.

3 files changed, 24 insertions, 14 deletions

diff --git a/SmartDeviceLink/SDLPinchGesture.m b/SmartDeviceLink/SDLPinchGesture.m
index 15a65ce55..6d1bd959b 100644
--- a/SmartDeviceLink/SDLPinchGesture.m
+++ b/SmartDeviceLink/SDLPinchGesture.m
@@ -18,12 +18,15 @@
 
 - (instancetype)initWithFirstTouch:(SDLTouch*)firstTouch secondTouch:(SDLTouch*)secondTouch {
     self = [super init];
-    if (self) {
-        _firstTouch = firstTouch;
-        _secondTouch = secondTouch;
-        _distance = -1;
-        _center = CGPointZero;
+    if (!self) {
+        return nil;
     }
+    
+    _firstTouch = firstTouch;
+    _secondTouch = secondTouch;
+    _distance = -1;
+    _center = CGPointZero;
+    
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLTouch.m b/SmartDeviceLink/SDLTouch.m
index dc8b27bf6..b4b198458 100644
--- a/SmartDeviceLink/SDLTouch.m
+++ b/SmartDeviceLink/SDLTouch.m
@@ -15,11 +15,14 @@
 
 - (instancetype)init {
     self = [super init];
-    if (self) {
-        _identifier = -1;
-        _location = CGPointZero;
-        _timeStamp = 0;
+    if (!self) {
+        return nil;
     }
+    
+    _identifier = -1;
+    _location = CGPointZero;
+    _timeStamp = 0;
+
     return self;
 }
 
diff --git a/SmartDeviceLink/SDLTouchManager.m b/SmartDeviceLink/SDLTouchManager.m
index e86b6fff2..839a5433a 100644
--- a/SmartDeviceLink/SDLTouchManager.m
+++ b/SmartDeviceLink/SDLTouchManager.m
@@ -50,12 +50,16 @@ static NSUInteger const MaximumNumberOfTouches = 2;
 @implementation SDLTouchManager
 
 - (instancetype)init {
-    if (self = [super init]) {
-        _movementTimeThreshold = 0.5f;
-        _tapTimeThreshold = 0.4f;
-        _tapDistanceThreshold = 50.0f;
-        _touchEnabled = YES;
+    self = [super init];
+    if (!self) {
+        return nil;
     }
+    
+    _movementTimeThreshold = 0.5f;
+    _tapTimeThreshold = 0.4f;
+    _tapDistanceThreshold = 50.0f;
+    _touchEnabled = YES;
+    
     return self;
 }