[CHORE] Refactor