Clean up/use dependency injection