speedup refactor