[CleanCode] Phase 4