Configured rooms and small code cleanup