cleanup
moved scapes into Data struct