diff --git a/launch_chffrplus.sh b/launch_chffrplus.sh
index 482cff9cb6..076697c885 100755
--- a/launch_chffrplus.sh
+++ b/launch_chffrplus.sh
@@ -14,6 +14,9 @@ function tici_init {
 }
 
 function two_init {
+  # Wifi scan
+  wpa_cli IFNAME=wlan0 SCAN
+
   # Restrict Android and other system processes to the first two cores
   echo 0-1 > /dev/cpuset/background/cpus
   echo 0-1 > /dev/cpuset/system-background/cpus
@@ -81,9 +84,6 @@ function two_init {
 }
 
 function launch {
-  # Wifi scan
-  wpa_cli IFNAME=wlan0 SCAN
-
   # Remove orphaned git lock if it exists on boot
   [ -f "$DIR/.git/index.lock" ] && rm -f $DIR/.git/index.lock
 
@@ -129,9 +129,7 @@ function launch {
   # comma two init
   if [ -f /EON ]; then
     two_init
-  fi
-
-  if [ -f /TICI ]; then
+  elif [ -f /TICI ]; then
     tici_init
   fi
 
diff --git a/selfdrive/ui/qt/setup/setup.cc b/selfdrive/ui/qt/setup/setup.cc
index a8efc21a2f..31938707be 100644
--- a/selfdrive/ui/qt/setup/setup.cc
+++ b/selfdrive/ui/qt/setup/setup.cc
@@ -26,8 +26,8 @@ int download(std::string url) {
   curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
   curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, NULL);
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp);
-  curl_easy_setopt (curl, CURLOPT_VERBOSE, 1L);
-  curl_easy_setopt (curl, CURLOPT_USERAGENT, USER_AGENT);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
+  curl_easy_setopt(curl, CURLOPT_USERAGENT, USER_AGENT);
   curl_easy_perform(curl);
   curl_easy_cleanup(curl);
   fclose(fp);