added ServiceFactory
Cosmetic changes
Thursday changes