Cleaned up service injection for the controller and switched to constructor injection.