Fix floor, cleanup