#43 - Refactoring using Dependency Injection

Published --