[TASK] Code refactor