diff --git a/code/controllers/subsystem/nano.dm b/code/controllers/subsystem/nano.dm
index 7bb22971e6f..44665c1a57d 100644
--- a/code/controllers/subsystem/nano.dm
+++ b/code/controllers/subsystem/nano.dm
@@ -15,14 +15,13 @@ var/datum/subsystem/nano/SSnano
 
 
 /datum/subsystem/nano/stat_entry()
-	..("O: [open_uis.len]|P:[processing_uis.len]") // Show how many interfaces we have open/are processing.
+	..("O:[open_uis.len]|P:[processing_uis.len]") // Show how many interfaces we have open/are processing.
 
 
 /datum/subsystem/nano/fire() // Process UIs.
-	for(var/thing in SSnano.processing_uis)
-		if(thing)
-			var/datum/nanoui/ui = thing
-			if(ui.src_object && ui.user)
-				ui.process()
-				continue
-		processing_uis.Remove(thing)
+	for(var/thing in processing_uis)
+		var/datum/nanoui/ui = thing
+		if(ui && ui.src_object && ui.user)
+			ui.process()
+			continue
+		processing_uis.Remove(ui)
diff --git a/code/modules/nano/subsystem.dm b/code/modules/nano/subsystem.dm
index 2d969d94bd6..a37f7ff18c8 100644
--- a/code/modules/nano/subsystem.dm
+++ b/code/modules/nano/subsystem.dm
@@ -103,7 +103,7 @@
 	for (var/ui_key in open_uis[src_object_key])
 		for (var/datum/nanoui/ui in open_uis[src_object_key][ui_key])
 			if(ui && ui.src_object && ui.user && ui.src_object.nano_host()) // Check the UI is valid.
-				ui.close() // Close the UI
+				ui.close() // Close the UI.
 				close_count++ // Count each UI we close.
 	return close_count