[General] Refactoring
Cleanup