[TASK] Small refactoring