[TASK] refactoring