[CleanCode] Phase 2