[CleanCode] Phase 3