diff --git a/src/tidler b/src/tidler
index 9f55b91..66d5d4a 100644
--- a/src/tidler
+++ b/src/tidler
@@ -1,13 +1,8 @@
 #!/bin/bash
 
 downloadTrack() {
-    if [ "$#" -ge 1 ]; then
-	echo "Downloading track with ID: $1"
-	id="$1"
-    else
-	echo "Enter track ID:"
-	read -r id
-    fi
+    echo "Downloading track with ID: $1"
+    id="$1"
     json_data=$(curl -s "https://tidal.401658.xyz/track/?id=$id&quality=LOSSLESS")
     track_name=$(echo "$json_data" | jq -r '.[0].title')
     artist_name=$(echo "$json_data" | jq -r '.[0].artist.name')
@@ -19,12 +14,8 @@ downloadTrack() {
 }
 
 searchTrack() {
-    if [ "$#" -ge 1 ]; then
-	track_name="$1"
-    else
-	echo "Enter track name:"
-	read -r track_name
-    fi
+    echo "Enter track name:"
+    read -r track_name
     track_name=$(echo "$track_name" | sed 's/ /%20/g')
     tracks=$(curl -s "https://tidal.401658.xyz/search/?s=$track_name" | jq -r '.items[] | "\(.id) - \(.title) by \(.artist.name)"')
     
@@ -33,7 +24,7 @@ searchTrack() {
         tracks_list+=("$list")
     done <<< "$tracks"
 
-    PS3="Please select a track:"
+    PS3="Please select a track: "
     select t in "${tracks_list[@]}"; do
         if [ -n "$t" ]; then
             track_id=$(echo "$t" | awk -F ' - ' '{print $1}')
@@ -48,28 +39,12 @@ searchTrack() {
 
 echo "Welcome to Tidal music downloader"
 echo ""
-
-if [ "$1" = "search" ]; then
-	if [ "$#" -ge 2 ]; then
-		shift
-    		jsw="$*"
-    		searchTrack "$jsw"
-	else
-		searchTrack
-	fi
-elif [ "$1" = "download" ]; then
-	if [ "$#" -ge 2 ]; then
-		downloadTrack "$2"
-	else
-		downloadTrack
-	fi
-else
-	echo "Choose: 1 = download ; 2 = search"
-	read option
-	if [ "$option" -eq 1 ]; then
-    		downloadTrack 
-	elif [ "$option" -eq 2 ]; then
-    		searchTrack
-	fi
+echo "Choose: 1 = download ; 2 = search"
+read option
+if [ "$option" -eq 1 ]; then
+    downloadTrack
+elif [ "$option" -eq 2 ]; then
+    searchTrack
 fi
 
+