Improved decoupling and testability
Improved decoupling and testability