refactoring FloorPlan