Improve testability of code, introduce Router interface for easier dependency injection