diff --git a/tdrop b/tdrop
index 32dedce..4827d68 100755
--- a/tdrop
+++ b/tdrop
@@ -91,8 +91,8 @@ do
 	a) auto_detect_wm=true;;
 	m) monitor_aware=true;;
 	-)
-		OPTION=$(echo "$OPTARG" | awk -F '=' '{print $1}')
-		OPTARG=$(echo "$OPTARG" | awk -F '=' '{print $2}')
+		OPTION=${OPTARG%%=*}
+		OPTARG=${OPTARG#*=}
 		case $OPTION in
 		height) height=$OPTARG;;
 		width) width=$OPTARG;;
@@ -225,7 +225,7 @@ update_geometry_settings_for_monitor() {
 	local last_monitor
 	last_monitor=$(< /tmp/tdrop/last_monitor)
 	echo "$current_monitor" > /tmp/tdrop/last_monitor
-	if [[ $current_monitor != $last_monitor ]]; then
+	if [[ $current_monitor != "$last_monitor" ]]; then
 		monitor_changed=true
 	fi
 }
@@ -438,12 +438,7 @@ maybe_cancel_auto_show() {
 #
 
 term_create() {
-	local term_command
-	if [[ -n $program_flags ]]; then
-		term_command="$term $program_flags"
-	else
-		term_command=$term
-	fi
+	local term_command="$term $program_flags"
 	if [[ $term == terminix ]]; then
 		sleep_term_time=0.3
 	fi
@@ -471,12 +466,7 @@ term_create() {
 }
 
 win_create() {
-	local win_command
-	if [[ -n $program_flags ]]; then
-		win_command="$term $program_flags"
-	else
-		win_command=$term
-	fi
+	local win_command="$term $program_flags"
 	$win_command &
 	# need to wait for window to be created
 	sleep $sleep_win_time