[Misc] Refactor