Move to a separate file + some cleanups
Remove DI traits