Variable renamings
Cleanup
Restructuration
Changed current frame selection