Refactored part of Room to Rect