[CleanCode] Phase 1