Applied some refactor to rooms