[General] Refactoring