[TASK] Refactoring