[TASK] Complete refactoring