Services are Singletons, corrected forgotten code -> clean code