Better naming, removed some unused stuff from timer accel implementation