Cleanup imports & newlines

6 files changed, 7 insertions, 9 deletions

diff --git a/SmartDeviceLink/SDLStreamingMediaManager.h b/SmartDeviceLink/SDLStreamingMediaManager.h
index 1a44a2b5e..46ccf83dc 100644
--- a/SmartDeviceLink/SDLStreamingMediaManager.h
+++ b/SmartDeviceLink/SDLStreamingMediaManager.h
@@ -80,7 +80,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (assign, nonatomic, readonly, getter=isVideoStreamingPaused) BOOL videoStreamingPaused;
 
 /**
- *  This is the current screen size of the connected display.
+ *  The current screen resolution of the connected display.
  */
 @property (assign, nonatomic, readonly) CGSize screenSize;
 
diff --git a/SmartDeviceLink/SDLStreamingVideoLifecycleManager.m b/SmartDeviceLink/SDLStreamingVideoLifecycleManager.m
index 2883105bf..8de6c70a6 100644
--- a/SmartDeviceLink/SDLStreamingVideoLifecycleManager.m
+++ b/SmartDeviceLink/SDLStreamingVideoLifecycleManager.m
@@ -112,16 +112,16 @@ typedef void(^SDLVideoCapabilityResponseHandler)(SDLVideoStreamingCapability *_N
     if (configuration.streamingMediaConfig.rootViewController != nil) {
         NSAssert(configuration.streamingMediaConfig.enableForcedFramerateSync, @"When using CarWindow (rootViewController != nil), forceFrameRateSync must be YES");
 
+        if (@available(iOS 9.0, *)) {
+            SDLLogD(@"Initializing focusable item locator");
+            _focusableItemManager = [[SDLFocusableItemLocator alloc] initWithViewController:self.carWindow.rootViewController connectionManager:_connectionManager streamManager:self];
+        }
+
         SDLLogD(@"Initializing CarWindow");
         _carWindow = [[SDLCarWindow alloc] initWithStreamManager:self configuration:configuration.streamingMediaConfig];
         _carWindow.rootViewController = configuration.streamingMediaConfig.rootViewController;
     }
 
-    if (@available(iOS 9.0, *)) {
-        SDLLogD(@"Initializing focusable item locator");
-        _focusableItemManager = [[SDLFocusableItemLocator alloc] initWithViewController:self.carWindow.rootViewController connectionManager:_connectionManager streamManager:self];
-    }
-
     _videoScaleManager = [[SDLStreamingVideoScaleManager alloc] init];
     _touchManager = [[SDLTouchManager alloc] initWithHitTester:(id)_focusableItemManager videoScaleManager:_videoScaleManager];
 
diff --git a/SmartDeviceLink/SDLTouchManager.h b/SmartDeviceLink/SDLTouchManager.h
index 22e0f8fc4..0cf2a1405 100644
--- a/SmartDeviceLink/SDLTouchManager.h
+++ b/SmartDeviceLink/SDLTouchManager.h
@@ -101,6 +101,7 @@ typedef void(^SDLTouchEventHandler)(SDLTouch *touch, SDLTouchType type);
  Initialize a touch manager with a hit tester if available
 
  @param hitTester The hit tester to be used to correlate a point with a view
+ @param videoScaleManager The scale manager that scales the touches received from the display screen coordinate system to the app's viewport coordinate system
  @return The initialized touch manager
  */
 - (instancetype)initWithHitTester:(nullable id<SDLFocusableItemHitTester>)hitTester videoScaleManager:(SDLStreamingVideoScaleManager *)videoScaleManager;
diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLStreamingVideoLifecycleManagerSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLStreamingVideoLifecycleManagerSpec.m
index 8a937f691..31b87c9c9 100644
--- a/SmartDeviceLinkTests/DevAPISpecs/SDLStreamingVideoLifecycleManagerSpec.m
+++ b/SmartDeviceLinkTests/DevAPISpecs/SDLStreamingVideoLifecycleManagerSpec.m
@@ -33,7 +33,6 @@
 #import "SDLStreamingVideoLifecycleManager.h"
 #import "SDLStreamingVideoScaleManager.h"
 #import "SDLSystemCapability.h"
-#import "SDLTouchManager.h"
 #import "SDLV2ProtocolHeader.h"
 #import "SDLV2ProtocolMessage.h"
 #import "SDLVideoStreamingCapability.h"
diff --git a/SmartDeviceLinkTests/ProxySpecs/SDLHapticManagerSpec.m b/SmartDeviceLinkTests/ProxySpecs/SDLHapticManagerSpec.m
index f8cc13aa4..979a1a277 100644
--- a/SmartDeviceLinkTests/ProxySpecs/SDLHapticManagerSpec.m
+++ b/SmartDeviceLinkTests/ProxySpecs/SDLHapticManagerSpec.m
@@ -513,4 +513,3 @@ describe(@"the haptic manager", ^{
 });
 
 QuickSpecEnd
-
diff --git a/SmartDeviceLinkTests/UtilitiesSpecs/Touches/SDLTouchManagerSpec.m b/SmartDeviceLinkTests/UtilitiesSpecs/Touches/SDLTouchManagerSpec.m
index 98eaed06d..cf95609cb 100644
--- a/SmartDeviceLinkTests/UtilitiesSpecs/Touches/SDLTouchManagerSpec.m
+++ b/SmartDeviceLinkTests/UtilitiesSpecs/Touches/SDLTouchManagerSpec.m
@@ -25,7 +25,6 @@
 #import "SDLTouchType.h"
 #import "SDLTouch.h"
 #import "SDLVideoStreamingCapability.h"
-#import "SDLImageResolution.h"
 
 @interface SDLTouchManager ()