Controller dependency injection refactor