added Room object. Made code more cleaner.