[TASK] refactor use of