[Refactor] Cleaned up Dependency Injection in Angular by using 'Dependency Annotation'