diff --git a/tools/nitpick/src/TestRunnerMobile.cpp b/tools/nitpick/src/TestRunnerMobile.cpp
index 969da02c9e..53a74da82f 100644
--- a/tools/nitpick/src/TestRunnerMobile.cpp
+++ b/tools/nitpick/src/TestRunnerMobile.cpp
@@ -117,12 +117,10 @@ void TestRunnerMobile::connectDevice() {
             _modelName = "UNKNOWN";
             for (int i = 0; i < tokens.size(); ++i) {
                 if (tokens[i].contains(MODEL)) {
-                    if (i < tokens.size()) {
-                        QString modelID = tokens[i].split(':')[1];
+                    QString modelID = tokens[i].split(':')[1];
 
-                        if (modelNames.count(modelID) == 1) {
-                            _modelName = modelNames[modelID];
-                        }
+                    if (modelNames.count(modelID) == 1) {
+                        _modelName = modelNames[modelID];
                     }
                     break;
                 }
@@ -223,7 +221,7 @@ void TestRunnerMobile::runInterface() {
         startCommand = "io.highfidelity.hifiinterface/.PermissionChecker";
     }
 
-        QString serverIP { getServerIP() };
+    QString serverIP { getServerIP() };
     if (serverIP == NETWORK_NOT_FOUND) {
         _runInterfacePushbutton->setEnabled(false);
         return;