[Misc] Refactoring