Refactored room drawing