[REFACTORING] Add subtasks on how to refactor it in better way