Refactoring
Proper validation of rooms