[task] refactoring