Cleaning up a bit, use hash for unique room