[TASK] refactor