Added choosing different rooms
cleaning code