Refactoring and added Dependency Inversion