That stuff shouldn't be room-specific!
Small refactor to kill unwanted globals