Code Cleanups
Preperations for Cleanup, settings and easier access to jobfactories