Use proper DI, cleanup
DOCS!