[Refactor] Minimal Refactor