Refactoring of DI and removal of static getInstance calls