cleaned up markup for rooms