diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index c24115063fc..425fb613b79 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -221,11 +221,10 @@
 	. = ..()
 
 	if(selector_switch_icon)
-		switch(burst_fire_selection)
-			if(FALSE)
-				. += "[initial(icon_state)]_semi"
-			if(TRUE)
-				. += "[initial(icon_state)]_burst"
+		if(burst_fire_selection)
+			. += "[initial(icon_state)]_burst"
+		else
+			. += "[initial(icon_state)]_semi"
 
 	if(show_bolt_icon)
 		if (bolt_type == BOLT_TYPE_LOCKING)
diff --git a/code/modules/transport/tram/tram_controller.dm b/code/modules/transport/tram/tram_controller.dm
index 594c2f443fe..364c0e24c4c 100644
--- a/code/modules/transport/tram/tram_controller.dm
+++ b/code/modules/transport/tram/tram_controller.dm
@@ -519,15 +519,11 @@
 /datum/transport_controller/linear/tram/proc/set_status_code(code, value)
 	if(code != DOORS_READY)
 		log_transport("TC: [specific_transport_id] status change [value ? "+" : "-"][english_list(bitfield_to_list(code, TRANSPORT_FLAGS))].")
-	switch(value)
-		if(TRUE)
-			controller_status |= code
-		if(FALSE)
-			controller_status &= ~code
-		else
-			stack_trace("Transport controller received invalid status code request [code]/[value]")
-			return
 
+	if(value)
+		controller_status |= code
+	else
+		controller_status &= ~code
 	send_transport_active_signal()
 
 /datum/transport_controller/linear/tram/proc/send_transport_active_signal()
diff --git a/code/modules/transport/tram/tram_signals.dm b/code/modules/transport/tram/tram_signals.dm
index e160e318472..6ed73cb5471 100644
--- a/code/modules/transport/tram/tram_signals.dm
+++ b/code/modules/transport/tram/tram_signals.dm
@@ -275,13 +275,11 @@
 	if(updated_controller.specific_transport_id != configured_transport_id)
 		return
 
-	switch(new_status)
-		if(TRUE)
-			if(operating_status == TRANSPORT_REMOTE_FAULT)
-				operating_status = TRANSPORT_SYSTEM_NORMAL
-		if(FALSE)
-			if(operating_status == TRANSPORT_SYSTEM_NORMAL)
-				operating_status = TRANSPORT_REMOTE_FAULT
+	if(new_status)
+		if(operating_status == TRANSPORT_REMOTE_FAULT)
+			operating_status = TRANSPORT_SYSTEM_NORMAL
+	else if(operating_status == TRANSPORT_SYSTEM_NORMAL)
+		operating_status = TRANSPORT_REMOTE_FAULT
 
 /**
  * Update processing state.