switched to a simpler DI syntax (will have minifications issues that will be addressed later)