Clean up.
Change factory to service