Clean up dependency injection, encapsulate actor in service