refactor class accellerate