[TASK] Refactor to increase readability