better DI refactor
remove comments
testing