Refactoring of the rooms section