Microoptimization and framerate-independent curvinc
Refactoring