Dependency Injection Patterns

Refactor monolithic classes to accept dependencies via constructors to facilitate easier testability.