[TASK] Minor refactoring